Add more explicit code for domain valid and more explicit error message

Add more explicit code for domain valid and more explicit error message #9