diff --git a/src/ostree/ot-admin-instutil-builtin-grub2-generate.c b/src/ostree/ot-admin-instutil-builtin-grub2-generate.c
index 0f8a8636..e73ffa14 100644
--- a/src/ostree/ot-admin-instutil-builtin-grub2-generate.c
+++ b/src/ostree/ot-admin-instutil-builtin-grub2-generate.c
@@ -33,28 +33,21 @@ ot_admin_instutil_builtin_grub2_generate (int argc, char **argv,
                                           OstreeCommandInvocation *invocation,
                                           GCancellable *cancellable, GError **error)
 {
-  gboolean ret = FALSE;
-  guint bootversion;
-  g_autoptr (GOptionContext) context = NULL;
+
+  g_autoptr (GOptionContext) context = g_option_context_new ("[BOOTVERSION]");
   g_autoptr (OstreeSysroot) sysroot = NULL;
-
-  context = g_option_context_new ("[BOOTVERSION]");
-
   if (!ostree_admin_option_context_parse (context, options, &argc, &argv,
                                           OSTREE_ADMIN_BUILTIN_FLAG_SUPERUSER
                                               | OSTREE_ADMIN_BUILTIN_FLAG_UNLOCKED,
                                           invocation, &sysroot, cancellable, error))
-    goto out;
+    return FALSE;
 
+  guint bootversion;
   if (argc >= 2)
     {
       bootversion = (guint)g_ascii_strtoull (argv[1], NULL, 10);
       if (!(bootversion == 0 || bootversion == 1))
-        {
-          g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Invalid bootversion: %u",
-                       bootversion);
-          goto out;
-        }
+        return glnx_throw (error, "Invalid bootversion: %u", bootversion);
     }
   else
     {
@@ -66,11 +59,6 @@ ot_admin_instutil_builtin_grub2_generate (int argc, char **argv,
       g_assert (bootversion == 0 || bootversion == 1);
     }
 
-  if (!ostree_cmd__private__ ()->ostree_generate_grub2_config (sysroot, bootversion, 1, cancellable,
-                                                               error))
-    goto out;
-
-  ret = TRUE;
-out:
-  return ret;
+  return ostree_cmd__private__ ()->ostree_generate_grub2_config (sysroot, bootversion, 1,
+                                                                 cancellable, error);
 }