Fixed issue with returning InvalidFieldError