Fix error handling :S
Merge pull request #1 from m0ppers/master

Fix error handling :S