Adjust SAP to return error message on failure