diff --git a/session-helper/flatpak-session-helper.c b/session-helper/flatpak-session-helper.c
index a835cf5b0..110eaffb5 100644
--- a/session-helper/flatpak-session-helper.c
+++ b/session-helper/flatpak-session-helper.c
@@ -173,7 +173,7 @@ handle_host_command (FlatpakDevelopment *object,
   if (*arg_cwd_path == 0)
     arg_cwd_path = NULL;
 
-  if (*arg_argv[0] == 0)
+  if (arg_argv == NULL || *arg_argv == NULL || *arg_argv[0] == 0)
     {
       g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR,
                                              G_DBUS_ERROR_INVALID_ARGS,
@@ -181,7 +181,6 @@ handle_host_command (FlatpakDevelopment *object,
       return TRUE;
     }
 
-
   g_debug ("Running host command %s", arg_argv[0]);
 
   n_fds = 0;