--- source/funny.c.orig	2002-02-27 22:22:48.000000000 -0600
+++ source/funny.c	2003-02-18 13:50:29.000000000 -0600
@@ -261,6 +261,12 @@
 	channel = Args[1];
 	line = Args[2];
 
+        if (channel == NULL || line == NULL)
+        {
+                bitchsay("Invalid number of arguments for %s", __FUNCTION__);
+                return;
+        }
+            
 	ptr = line;
 	while (*ptr)
 	{