diff --git a/op/op.GroupMgr.php b/op/op.GroupMgr.php
index fa7f34deb..c427c6b70 100644
--- a/op/op.GroupMgr.php
+++ b/op/op.GroupMgr.php
@@ -44,7 +44,13 @@ if ($action == "addgroup") {
 	}
 
 	$name = $_POST["name"];
+	if(!$name) {
+		UI::exitError(getMLText("admin_tools"),getMLText("group_name_missing"));
+	}
 	$comment = $_POST["comment"];
+	if ($settings->_strictFormCheck && !$comment) {
+		UI::exitError(getMLText("admin_tools"),getMLText("group_comment_missing"));
+	}
 
 	if (is_object($dms->getGroupByName($name))) {
 		UI::exitError(getMLText("admin_tools"),getMLText("group_exists"));