Hotfix for error handling
Merge pull request #7 from zefciu/hotfix_dependencies

Hotfix for error handling