Merge pull request #92 from opennetworkinglab/devl/exceptions

Devl/exceptions