Merge pull request #129 from buren/Exception_fixes

Exception fixes
Merge branch 'master' of github.com:buren/enduro into Exception_fixes