Added changes made in upstream to use the new prepareErrorResponse
method when an error is encountered trying to get a NotificationResponse