diff --git a/src/ostree/main.c b/src/ostree/main.c
index 8842bf34..99d7d916 100644
--- a/src/ostree/main.c
+++ b/src/ostree/main.c
@@ -75,8 +75,6 @@ main (int    argc,
   g_set_prgname (argv[0]);
 
   ret = ostree_run (argc, argv, commands, &error);
-  if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED))
-    ostree_usage (commands, TRUE);
 
   if (error != NULL)
     {
diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c
index 44e1bd49..5b54af4c 100644
--- a/src/ostree/ot-main.c
+++ b/src/ostree/ot-main.c
@@ -190,6 +190,7 @@ ostree_run (int    argc,
             {
               g_set_error (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
                            "Unknown command '%s'", command_name);
+              ostree_usage (commands, TRUE);
             }
         }