fixed error handling
fixed name
Merge pull request #793 from wanderer/development

Development: fixed error handling