diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c
index b8c696ca3..49696aa20 100644
--- a/polymer/eduke32/source/config.c
+++ b/polymer/eduke32/source/config.c
@@ -832,8 +832,9 @@ void CONFIG_WriteBinds(void) // save binds and aliases to disk
     {
         symbol_t *symb;
         fprintf(fp,"// this file automatically generated by EDuke32\n// do not modify if you lack common sense\n");
-        for (i=0;i<MAXBOUNDKEYS;i++)if (*boundkeys[i].name)
-            fprintf(fp,"bind %s%s \"%s\"\n",boundkeys[i].key,boundkeys[i].repeat?"":" norepeat",boundkeys[i].name);
+        for (i=0;i<MAXBOUNDKEYS;i++)
+            if (boundkeys[i].key && *boundkeys[i].name)
+                fprintf(fp,"bind %s%s \"%s\"\n",boundkeys[i].key,boundkeys[i].repeat?"":" norepeat",boundkeys[i].name);
 
         for (symb=symbols; symb!=NULL; symb=symb->next)
             if (symb->func == (void *)OSD_ALIAS)
diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c
index 09ef4900e..cf154b549 100644
--- a/polymer/eduke32/source/gamedef.c
+++ b/polymer/eduke32/source/gamedef.c
@@ -4289,6 +4289,12 @@ repeatcase:
             gamefunctions[j][i] = *textptr;
             keydefaults[j*3][i] = *textptr;
             textptr++,i++;
+            if (*textptr == '/')
+            {
+                initprintf("%s:%d: warning: invalid character in function name.\n",compilefile,line_number);
+                while (*textptr != 0x0a && *textptr != 0x0d && *textptr != 0) textptr++;
+                break;
+            }
             if (i >= MAXGAMEFUNCLEN-1)
             {
                 initprintf("%s:%d: error: function name exceeds limit of %d characters.\n",compilefile,line_number,MAXGAMEFUNCLEN);