Improve handling of Error Exceptions