diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index c7ebd0807..3aca7af6d 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -45,6 +45,8 @@ class DomainNameserverForm(forms.Form):
         self.clean_empty_strings(cleaned_data)
         server = cleaned_data.get("server", "")
         ip = cleaned_data.get("ip", None)
+        # remove ANY spaces in the ip field
+        ip = ip.replace(" ", "")
         domain = cleaned_data.get("domain", "")
 
         ip_list = self.extract_ip_list(ip)
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index acfdc1a7b..07e49dfdd 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -277,7 +277,7 @@ class Domain(TimeStampedModel, DomainHelper):
             return response.code
         except RegistryError as e:
             logger.error("Error _create_host, code was %s error was %s" % (e.code, e))
-            return e.code
+            raise e
 
     def _convert_list_to_dict(self, listToConvert: list[tuple[str, list]]):
         """converts a list of hosts into a dictionary
@@ -1593,7 +1593,7 @@ class Domain(TimeStampedModel, DomainHelper):
             return response.code
         except RegistryError as e:
             logger.error("Error _update_host, code was %s error was %s" % (e.code, e))
-            return e.code
+            raise e
 
     def addAndRemoveHostsFromDomain(
         self, hostsToAdd: list[str], hostsToDelete: list[str]
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 4fd01bd0c..ede44b1d5 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -295,10 +295,6 @@ class DomainNameserversView(DomainFormBaseView):
                 if ip_string:
                     # Split the string into a list using a comma as the delimiter
                     ip_list = ip_string.split(",")
-                # Remove any leading or trailing whitespace from each IP in the list
-                # this will return [] if no ips have been entered, which is taken
-                # into account in the model in checkHostIPCombo
-                ip_list = [ip.replace(" ", "").strip() for ip in ip_list]
 
                 as_tuple = (
                     form.cleaned_data["server"],