fixes #2959 - Error handling
Merge pull request #22 from mbacovsky/2959_error_handling

fixes #2959 - Error handling