Update for changed error message return.