error handling
error handling
Merge pull request #19 from blaabjerg88/master

error handling