diff --git a/Changes b/Changes
index 590cfaeab..4b8aa76ca 100644
--- a/Changes
+++ b/Changes
@@ -798,3 +798,4 @@ seen. gmtime warning still there
 - Fixed a win32 bug that can cause unexpected crashes while using the editor
 - Some httpd stuff and a #define CHROOTDIR problem found by Zhadum
 - Added scan_http, scans on 80, 3128, 8080 in a threaded manner
+- Fixed a /gline crash bug found by DemOnBaBy
diff --git a/src/s_kline.c b/src/s_kline.c
index d6c93d668..13318272c 100644
--- a/src/s_kline.c
+++ b/src/s_kline.c
@@ -801,6 +801,8 @@ int  m_gline(aClient *cptr, aClient *sptr, int parc, char *parv[])
       nochecks:
 	usermask = strtok(mask, "@");
 	hostmask = strtok(NULL, "");
+	if (BadPtr(usermask) || BadPtr(hostmask))
+		return;
 	tkl_check_expire(NULL);
 
 	for (tk = tklines; tk; tk = tk->next)