1 files changed, 9 insertions, 8 deletions
diff --git a/geometry.c b/geometry.c
index 91ab244..a5bf70c 100644
--- a/geometry.c
+++ b/geometry.c
@@ -2884,17 +2884,18 @@ HandleGeometryFile(XkbFile * file,
                 info->errorCount++;
             break;
         case StmtVModDef:
-            if (!failWhat)
-                failWhat = "virtual modifier";
+            failWhat = "virtual modifier";
+            goto fail;
         case StmtInterpDef:
-            if (!failWhat)
-                failWhat = "symbol interpretation";
+            failWhat = "symbol interpretation";
+            goto fail;
         case StmtGroupCompatDef:
-            if (!failWhat)
-                failWhat = "group compatibility map";
+            failWhat = "group compatibility map";
+            goto fail;
         case StmtKeycodeDef:
-            if (!failWhat)
-                failWhat = "key name";
+            failWhat = "key name";
+            goto fail;
+        fail:
             ERROR("Interpretation files may not include other types\n");
             ACTION("Ignoring %s definition.\n", failWhat);
             info->errorCount++;