1 files changed, 7 insertions, 0 deletions
diff --git a/src/users.c b/src/users.c
index bcbc56b69..d0df61c83 100644
--- a/src/users.c
+++ b/src/users.c
@@ -306,6 +306,13 @@ User *finduser(const char *nick)
 {
     User *user;
 
+    if (!nick || !*nick) {
+        if (debug) {
+            alog("Error: finduser() called with NULL values");
+        }
+        return NULL;
+    }
+
     if (debug >= 3)
         alog("debug: finduser(%p)", nick);
     user = userlist[HASH(nick)];