diff --git a/src/common/outbound.c b/src/common/outbound.c
index 3709ce96..6beaa2cc 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -3253,7 +3253,7 @@ urlserv:
 			co++;
 			if (*co == '#')
 				*channel = co+1;
-			else
+			else if (*co != '\0')
 				*channel = co;
 				
 			/* check for key - mirc style */