Fix error handling, remove exception throwing
Missed one error check
Merge pull request #56 from schinken/error-handling

Fix error handling, remove exception throwing