diff --git a/src/registrar/models/utility/generic_helper.py b/src/registrar/models/utility/generic_helper.py
index d1d890da4..7d3586770 100644
--- a/src/registrar/models/utility/generic_helper.py
+++ b/src/registrar/models/utility/generic_helper.py
@@ -131,7 +131,7 @@ class CreateOrUpdateOrganizationTypeHelper:
 
                 # Update the field
                 self._update_fields(organization_type_needs_update, generic_org_type_needs_update)
-        except:
+        except self.sender.DoesNotExist:
             pass
 
     def _update_fields(self, organization_type_needs_update, generic_org_type_needs_update):
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index cf00994be..97e48279d 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -508,10 +508,9 @@ class TestDomainAdmin(MockEppLib, WebTest):
                 domain_request.approve()
 
             response = self.client.get("/admin/registrar/domain/")
-
             # There are 4 template references to Federal (4) plus four references in the table
             # for our actual domain_request
-            self.assertContains(response, "Federal", count=36)
+            self.assertContains(response, "Federal", count=48)
             # This may be a bit more robust
             self.assertContains(response, '<td class="field-generic_org_type">Federal</td>', count=1)
             # Now let's make sure the long description does not exist
@@ -1267,7 +1266,7 @@ class TestDomainRequestAdmin(MockEppLib):
             response = self.client.get("/admin/registrar/domainrequest/?generic_org_type__exact=federal")
             # There are 2 template references to Federal (4) and two in the results data
             # of the request
-            self.assertContains(response, "Federal", count=34)
+            self.assertContains(response, "Federal", count=46)
             # This may be a bit more robust
             self.assertContains(response, '<td class="field-generic_org_type">Federal</td>', count=1)
             # Now let's make sure the long description does not exist