diff --git a/examples/test-mp4.c b/examples/test-mp4.c
index 263d122efc..9bcaab45e2 100644
--- a/examples/test-mp4.c
+++ b/examples/test-mp4.c
@@ -104,6 +104,11 @@ main (int argc, char *argv[])
     g_printerr ("Error parsing options: %s\n", error->message);
     return -1;
   }
+
+  if (argc < 2) {
+    g_print ("%s\n", g_option_context_get_help (optctx, TRUE, NULL));
+    return 1;
+  }
   g_option_context_free (optctx);
 
   loop = g_main_loop_new (NULL, FALSE);
@@ -117,7 +122,7 @@ main (int argc, char *argv[])
   mounts = gst_rtsp_server_get_mount_points (server);
 
   str = g_strdup_printf ("( "
-      "filesrc location=%s ! qtdemux name=d "
+      "filesrc location=\"%s\" ! qtdemux name=d "
       "d. ! queue ! rtph264pay pt=96 name=pay0 "
       "d. ! queue ! rtpmp4apay pt=97 name=pay1 " ")", argv[1]);