Merge pull request #324 from kevmoo/master

Fixed crash in error handling flow