diff --git a/acls_test.go b/acls_test.go
index f8407d42..2bd5bf96 100644
--- a/acls_test.go
+++ b/acls_test.go
@@ -685,13 +685,13 @@ func Test_listMachinesInNamespace(t *testing.T) {
 			want: []Machine{},
 		},
 	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := listMachinesInNamespace(tt.args.machines, tt.args.namespace); !reflect.DeepEqual(
+	for _, test := range tests {
+		t.Run(test.name, func(t *testing.T) {
+			if got := listMachinesInNamespace(test.args.machines, test.args.namespace); !reflect.DeepEqual(
 				got,
-				tt.want,
+				test.want,
 			) {
-				t.Errorf("listMachinesInNamespace() = %v, want %v", got, tt.want)
+				t.Errorf("listMachinesInNamespace() = %v, want %v", got, test.want)
 			}
 		})
 	}
diff --git a/dns.go b/dns.go
index be6238f8..45e0faeb 100644
--- a/dns.go
+++ b/dns.go
@@ -179,8 +179,14 @@ func getMapResponseDNSConfig(
 		for _, p := range peers {
 			namespaceSet.Add(p.Namespace)
 		}
-		for _, namespace := range namespaceSet.List() {
-			var dnsRoute string = fmt.Sprintf("%v.%v", namespace.(Namespace).Name, baseDomain)
+		for _, ns := range namespaceSet.List() {
+			namespace, ok := ns.(Namespace)
+			if !ok {
+				dnsConfig = dnsConfigOrig
+
+				continue
+			}
+			dnsRoute := fmt.Sprintf("%v.%v", namespace.Name, baseDomain)
 			dnsConfig.Routes[dnsRoute] = nil
 		}
 	} else {
diff --git a/utils.go b/utils.go
index 794971a1..3cee5e35 100644
--- a/utils.go
+++ b/utils.go
@@ -218,6 +218,7 @@ func containsString(ss []string, s string) bool {
 			return true
 		}
 	}
+
 	return false
 }