diff --git a/frontend/src/views/domain/DomainEdit.vue b/frontend/src/views/domain/DomainEdit.vue
index 840f2bfc..5f70ef9c 100644
--- a/frontend/src/views/domain/DomainEdit.vue
+++ b/frontend/src/views/domain/DomainEdit.vue
@@ -18,7 +18,7 @@ const router = useRouter()
 
 const name = ref(route.params.name.toString())
 watch(route, () => {
-    name.value = route.params.name.toString()
+    name.value = route.params?.name?.toString() ?? ''
 })
 
 const update = ref(0)
diff --git a/server/pkg/nginx/tokenize.go b/server/pkg/nginx/tokenize.go
index e8a63423..02ed34c9 100644
--- a/server/pkg/nginx/tokenize.go
+++ b/server/pkg/nginx/tokenize.go
@@ -76,7 +76,7 @@ func (s *NgxServer) parseDirective(d NgxDirective) {
 		return
 	}
 
-	regExp := regexp.MustCompile("(\\S+?)\\s+?{?(.+?)[;|}]")
+	regExp := regexp.MustCompile("(\\S+?)\\s+?{?(.+)[;|}]")
 	matchSlice := regExp.FindAllStringSubmatch(str, -1)
 
 	for k, v := range matchSlice {