Updated default exception handling
Merge pull request #324 from shermdog/exceptions

Updated default exception handling