--- a/src/noffle.c	Tue Dec 18 15:24:49 2001 +0000
+++ b/src/noffle.c	Tue Dec 18 15:27:08 2001 +0000
@@ -10,7 +10,7 @@
   received for some seconds (to allow multiple clients connect at the same
   time).
 
-  $Id: noffle.c 342 2001-12-09 12:31:57Z bears $
+  $Id: noffle.c 358 2001-12-18 15:27:08Z mirkol $
 */
 
 #if HAVE_CONFIG_H
@@ -323,7 +323,12 @@
     name = Utl_stripWhiteSpace( grp );
     
     if ( Grp_exists( name ) )
+    {
         fprintf( stderr, "'%s' already exists.\n", name );
+        return;
+    }
+    if ( ! Grp_isValidGroupName( name ) )
+        fprintf( stderr, "'%s' invalid group name.\n", name );
     else
     {
         Log_inf( "Creating new local group '%s'", name );
@@ -346,7 +351,17 @@
     name = Utl_stripWhiteSpace( grp );
     
     if ( ! Grp_exists( name ) )
+    {
         fprintf( stderr, "'%s' does not exist.\n", name );
+        return;
+    }
+    if ( ! Grp_isValidGroupName( name ) )
+    {
+        fprintf( stderr, "'%s' invalid group name. Skipping deletion of overviews.\n", name );
+        Log_inf( "Deleting invalid group '%s' without deleting overviews.", name );
+        Grp_delete( name );
+        printf( "Group '%s' deleted.\n", name );
+    }
     else
     {
 	int i;