Fixed exceptions
Refactor
merge conflict löst! :))
Merge branch 'master' of github.com:buren/enduro into Fix_exceptions
Merge pull request #58 from buren/Fix_exceptions

Fixed exceptions