Merge "Adding a message for api-error-stasherror"