Adding hybrid custom error handling
Merge pull request #458 from khawkins/hybrid_error_handling

Adding hybrid custom error handling