Cancel button no longer displays two error messages