diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index 241c809dc13e8823fe384e140855a89e9a079ce5..5962dc14d05207ed11ca9fa9c27739a7957dfba7 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -973,8 +973,17 @@ nautilus_application_handle_file_args (NautilusApplication *self,
                 file = g_file_new_for_commandline_arg_and_cwd (remaining[idx], cwd);
                 g_free (cwd);
             }
-            g_ptr_array_add (file_array, file);
+
+            if (nautilus_is_search_directory(file))
+            {
+                g_printf(_("error: x-nautilus-search is no longer supported"));
+            }
+            else
+            {
+                g_ptr_array_add (file_array, file);
+            }
         }
+
     }
     else if (g_variant_dict_contains (options, "new-window"))
     {