1 files changed, 7 insertions, 0 deletions
diff --git a/src/channels.c b/src/channels.c
index 2b871853d..8225e5f2a 100644
--- a/src/channels.c
+++ b/src/channels.c
@@ -305,6 +305,13 @@ Channel *findchan(const char *chan)
 {
     Channel *c;
 
+    if (!chan || !*chan) {
+        if (debug) {
+            alog("Error: findchan() called with NULL values");
+        }
+        return NULL;
+    }
+
     if (debug >= 3)
         alog("debug: findchan(%p)", chan);
     c = chanlist[HASH(chan)];