diff --git a/src/parse.c b/src/parse.c
index 643f523e6..8f06270f9 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -218,7 +218,8 @@ int  parse(aClient *cptr, char *buffer, char *bufend)
 	*s = '\0';
 	for (ch = buffer; *ch == ' '; ch++)
 		;
-	para[0] = from->name;
+	//para[0] = from->name;
+	para[0] = 0xDEADBEEF; /* helps us catch bugs :) -- 1/2 */
 	if (*ch == ':' || *ch == '@')
 	{
 		/*
@@ -245,7 +246,8 @@ int  parse(aClient *cptr, char *buffer, char *bufend)
 			from = find_client(sender, (aClient *)NULL);
 			if (!from && index(sender, '@'))
 				from = find_nickserv(sender, (aClient *)NULL);
-			para[0] = sender;
+			//para[0] = sender;
+			para[0] = 0xDEADBEEF; /* helps us catch bugs :) -- 2/2 */
 
 			/* Hmm! If the client corresponding to the
 			 * prefix is not found--what is the correct