Fixes to error handling condition flow.
Merge pull request #12 from peterlozano/error-handling

Fixes to error handling condition flow.