Add server side domain checking and error messages