diff --git a/Changes b/Changes
index 3a237af5b..08ab2d640 100644
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
 Anope Version  S V N
 --------------------
 Provided by Anope Dev. <dev@anope.org> - 2005
+11/14 F Added a check for nickchars before trying to use them in /os stats[ #00]
 11/08 F Remove tmp modules from runtime folder when we can.               [ #00]
 11/02 F !protect/!deprotect no longer work for a number of ircds.         [#403]
 11/02 F segfault when os modloading a non-existing module.                [ #00]
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index 030be06eb..991d0a15d 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -331,8 +331,10 @@ int do_stats(User * u)
                 if (capab_info[i].flag == CAPAB_NICKCHARS) {
                     strncat(buf, "=", buflen);
                     buflen--;
-                    strncat(buf, ircd->nickchars, buflen);
-                    buflen -= strlen(ircd->nickchars);
+		    if(ircd->nickchars) {
+                        strncat(buf, ircd->nickchars, buflen);
+                        buflen -= strlen(ircd->nickchars);
+		    } /* leave blank if it was null */
                 }
             }
         }