diff --git a/g10/gpg.c b/g10/gpg.c
index df6c24699..9adf16938 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -4121,7 +4121,9 @@ main (int argc, char **argv)
                 {
                   x_usage = *argv++; argc--;
                   if (argc)
-                    x_expire = *argv++; argc--;
+                    {
+                      x_expire = *argv++; argc--;
+                    }
                 }
             }
           quick_generate_keypair (ctrl, username, x_algo, x_usage, x_expire);
@@ -4195,7 +4197,9 @@ main (int argc, char **argv)
                 {
                   x_usage = *argv++; argc--;
                   if (argc)
-                    x_expire = *argv++; argc--;
+                   {
+                     x_expire = *argv++; argc--;
+                   }
                 }
             }
           keyedit_quick_addkey (ctrl, x_fpr, x_algo, x_usage, x_expire);