Added more error handling
Minor bugfixes
Merge pull request #25 from ionux/master

Added more error handling