Changed to handle validation failure