More graceful error checking of password mismatch