diff --git a/remote.c b/remote.c
index 3aed3106ded115d2b748f48d373b6a9f850a0225..b5ecd473fe4ff24a32eb35f66c6bfd3eb3be1292 100644
--- a/remote.c
+++ b/remote.c
@@ -502,6 +502,9 @@ mozilla_remote_commands (Display *dpy, Window window, char **commands)
   int status = 0;
   mozilla_remote_init_atoms (dpy);
 
+  if (commands == NULL)
+    return;
+
   if (window == 0)
     window = mozilla_remote_find_window (dpy);
   else