diff --git a/src/main/java/mops/gruppen2/controller/WebController.java b/src/main/java/mops/gruppen2/controller/WebController.java
index e8f9248..69f96ee 100644
--- a/src/main/java/mops/gruppen2/controller/WebController.java
+++ b/src/main/java/mops/gruppen2/controller/WebController.java
@@ -120,11 +120,8 @@ public class WebController {
                                  @RequestParam(value = "parent", required = false) String parent) throws EventException {
 
         Account account = keyCloakService.createAccountFromPrincipal(token);
-        visibility = visibility == null;
-        maxInfiniteUsers = maxInfiniteUsers != null;
         UUID parentUUID = controllerService.getUUID(parent);
         controllerService.createGroup(account, title, description, visibility, maxInfiniteUsers, userMaximum, parentUUID);
-
         return "redirect:/gruppen2/";
     }
 
diff --git a/src/main/java/mops/gruppen2/domain/exception/BadParameterException.java b/src/main/java/mops/gruppen2/domain/exception/BadParameterException.java
new file mode 100644
index 0000000..b1767d2
--- /dev/null
+++ b/src/main/java/mops/gruppen2/domain/exception/BadParameterException.java
@@ -0,0 +1,10 @@
+package mops.gruppen2.domain.exception;
+
+import org.springframework.http.HttpStatus;
+
+public class BadParameterException extends EventException {
+
+	public BadParameterException(String info) {
+		super(HttpStatus.INTERNAL_SERVER_ERROR, "Fehlerhafter Parameter angegeben!", info);
+	}
+}
diff --git a/src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java b/src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java
deleted file mode 100644
index 0ec684d..0000000
--- a/src/main/java/mops/gruppen2/domain/exception/NoMaximumMemberException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package mops.gruppen2.domain.exception;
-
-import org.springframework.http.HttpStatus;
-
-public class NoMaximumMemberException extends EventException {
-
-	public NoMaximumMemberException(String info) {
-		super(HttpStatus.INTERNAL_SERVER_ERROR, "Es wurde keine maximale Gruppenanzahl festgelegt", info);
-	}
-}
diff --git a/src/main/java/mops/gruppen2/service/ControllerService.java b/src/main/java/mops/gruppen2/service/ControllerService.java
index 334c5b5..bd38ce7 100644
--- a/src/main/java/mops/gruppen2/service/ControllerService.java
+++ b/src/main/java/mops/gruppen2/service/ControllerService.java
@@ -15,7 +15,7 @@ import mops.gruppen2.domain.event.UpdateGroupTitleEvent;
 import mops.gruppen2.domain.event.UpdateRoleEvent;
 import mops.gruppen2.domain.event.UpdateUserMaxEvent;
 import mops.gruppen2.domain.exception.EventException;
-import mops.gruppen2.domain.exception.NoMaximumMemberException;
+import mops.gruppen2.domain.exception.BadParameterException;
 import mops.gruppen2.domain.exception.UserNotFoundException;
 import mops.gruppen2.domain.exception.WrongFileException;
 import mops.gruppen2.security.Account;
@@ -54,20 +54,37 @@ public class ControllerService {
      * @param title       Gruppentitel
      * @param description Gruppenbeschreibung
      */
-    public void createGroup(Account account, String title, String description, Boolean maxInfiniteUsers, Boolean visibility, Long userMaximum, UUID parent) throws EventException {
+    public void createGroup(Account account, String title, String description, Boolean visibility, Boolean maxInfiniteUsers, Long userMaximum, UUID parent) throws EventException {
         Visibility visibility1;
         UUID groupId = eventService.checkGroup();
 
+        maxInfiniteUsers = maxInfiniteUsers != null;
+
+
+        if(maxInfiniteUsers) {
+            userMaximum = 100000L;
+        }
+
+        if(description == null) {
+            throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben");
+        }
+
+        if(title == null) {
+            throw new BadParameterException("Der Titel wurde nicht korrekt angegeben");
+        }
+
+        if (userMaximum == null) {
+            throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben");
+        }
+
+        visibility = visibility == null;
+
         if (visibility) {
             visibility1 = Visibility.PUBLIC;
         } else {
             visibility1 = Visibility.PRIVATE;
         }
 
-        if(maxInfiniteUsers){
-            userMaximum = 100000L;
-        }
-
         CreateGroupEvent createGroupEvent = new CreateGroupEvent(groupId, account.getName(), parent, GroupType.SIMPLE, visibility1, userMaximum);
         eventService.saveEvent(createGroupEvent);
 
@@ -80,11 +97,20 @@ public class ControllerService {
     public void createOrga(Account account, String title, String description, Boolean visibility, Boolean lecture, Boolean maxInfiniteUsers, Long userMaximum, UUID parent, MultipartFile file) throws EventException, IOException {
         List<User> userList = new ArrayList<>();
         maxInfiniteUsers = maxInfiniteUsers != null;
-        if(maxInfiniteUsers){
+        if(maxInfiniteUsers) {
             userMaximum = 100000L;
         }
+
+        if(description == null) {
+            throw new BadParameterException("Die Beschreibung wurde nicht korrekt angegeben");
+        }
+
+        if(title == null) {
+            throw new BadParameterException("Der Titel wurde nicht korrekt angegeben");
+        }
+
         if (userMaximum == null) {
-            throw new NoMaximumMemberException(this.getClass().toString());
+            throw new BadParameterException("Teilnehmeranzahl wurde nicht korrekt angegeben");
         }
         if (!file.isEmpty()) {
             try {