diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index 9b71f6121..57f783b91 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -555,6 +555,8 @@ XkbAddGeomProperty(XkbGeometryPtr geom, char *name, char *value)
         if ((prop->name) && (strcmp(name, prop->name) == 0)) {
             free(prop->value);
             prop->value = strdup(value);
+            if (!prop->value)
+                return NULL;
             return prop;
         }
     }