WP-2119 Added special validate error handling