diff --git a/pressure-vessel/wrap.c b/pressure-vessel/wrap.c
index 47426409246ec2b05742a57f66b75e2293774334..cf641045392422f8d77f57f59917798972019063 100644
--- a/pressure-vessel/wrap.c
+++ b/pressure-vessel/wrap.c
@@ -1247,10 +1247,8 @@ main (int argc,
 
   if (g_getenv ("STEAM_RUNTIME") != NULL)
     {
-      g_printerr ("%s: This program should not be run in the Steam Runtime.",
-                  g_get_prgname ());
-      g_printerr ("%s: Use pressure-vessel-unruntime instead.",
-                  g_get_prgname ());
+      g_warning ("This program should not be run in the Steam Runtime. "
+                 "Use pressure-vessel-unruntime instead.");
       ret = 2;
       goto out;
     }
@@ -1344,8 +1342,8 @@ main (int argc,
   g_assert (opt_graphics_provider != NULL);
   if (opt_graphics_provider[0] != '\0' && opt_graphics_provider[0] != '/')
     {
-      g_printerr ("%s: --graphics-provider path must be absolute, not \"%s\"\n",
-                  g_get_prgname (), opt_graphics_provider);
+      g_warning ("--graphics-provider path must be absolute, not \"%s\"",
+                 opt_graphics_provider);
       goto out;
     }
 
@@ -1383,8 +1381,7 @@ main (int argc,
 
   if (argc < 2 && !opt_test && !opt_only_prepare)
     {
-      g_printerr ("%s: An executable to run is required\n",
-                  g_get_prgname ());
+      g_warning ("An executable to run is required");
       goto out;
     }
 
@@ -1398,8 +1395,7 @@ main (int argc,
 
   if (opt_terminal == PV_TERMINAL_NONE && opt_shell != PV_SHELL_NONE)
     {
-      g_printerr ("%s: --terminal=none is incompatible with --shell\n",
-                  g_get_prgname ());
+      g_warning ("--terminal=none is incompatible with --shell");
       goto out;
     }
 
@@ -1462,9 +1458,8 @@ main (int argc,
     }
   else
     {
-      g_printerr ("%s: Either --home, --freedesktop-app-id, --steam-app-id "
-                  "or $SteamAppId is required\n",
-                  g_get_prgname ());
+      g_warning ("Either --home, --freedesktop-app-id, --steam-app-id "
+                 "or $SteamAppId is required");
       goto out;
     }
 
@@ -1476,9 +1471,8 @@ main (int argc,
 
           if (equals == NULL)
             {
-              g_printerr ("%s: --env-if-host argument must be of the form "
-                          "NAME=VALUE, not \"%s\"\n",
-                          g_get_prgname (), opt_env_if_host[i]);
+              g_warning ("--env-if-host argument must be of the form "
+                         "NAME=VALUE, not \"%s\"", opt_env_if_host[i]);
               goto out;
             }
         }
@@ -1486,8 +1480,7 @@ main (int argc,
 
   if (opt_only_prepare && opt_test)
     {
-      g_printerr ("%s: --only-prepare and --test are mutually exclusive",
-                  g_get_prgname ());
+      g_warning ("--only-prepare and --test are mutually exclusive");
       goto out;
     }
 
@@ -1498,16 +1491,14 @@ main (int argc,
           if (strchr (opt_filesystems[i], ':') != NULL ||
               strchr (opt_filesystems[i], '\\') != NULL)
             {
-              g_printerr ("%s: ':' and '\\' in --filesystem argument "
-                          "not handled yet\n",
-                          g_get_prgname ());
+              g_warning ("':' and '\\' in --filesystem argument "
+                         "not handled yet");
               goto out;
             }
           else if (!g_path_is_absolute (opt_filesystems[i]))
             {
-              g_printerr ("%s: --filesystem argument must be an absolute "
-                          "path, not \"%s\"\n",
-                          g_get_prgname (), opt_filesystems[i]);
+              g_warning ("--filesystem argument must be an absolute "
+                         "path, not \"%s\"", opt_filesystems[i]);
               goto out;
             }
         }