better handling for ExpectedFailedRequestExceptions