Error handling improvements and small edits
Merge pull request #1 from a3gis/master

Error handling improvements