diff --git a/src/perl/irc/Server.xs b/src/perl/irc/Server.xs
index 40405955..66045bb9 100644
--- a/src/perl/irc/Server.xs
+++ b/src/perl/irc/Server.xs
@@ -101,8 +101,8 @@ server_redirect_event(server, command, arg, remote, failure_signal, signals)
 	char *failure_signal
 	void *signals
 CODE:
-	server_redirect_event_list(server, command, arg, remote,
-				   failure_signal,
+	server_redirect_event_list(server, command, *arg == '\0' ? NULL : arg, remote,
+				   *failure_signal == '\0' ? NULL : failure_signal,
 				   event_hash2list(hvref(ST(5))));
 
 char *