Updated to include original request when an error occurs