2 files changed, 3 insertions, 3 deletions

diff --git a/sway/ipc-json.c b/sway/ipc-json.c
index e1098942..23016dbd 100644
--- a/sway/ipc-json.c
+++ b/sway/ipc-json.c
@@ -597,7 +597,7 @@ json_object *ipc_json_describe_input(struct sway_input_device *device) {
                                 const char *layout =
                                         xkb_keymap_layout_get_name(keymap, layout_idx);
                                 json_object_object_add(object, "xkb_active_layout_name",
-                                                json_object_new_string(layout));
+                                                layout ? json_object_new_string(layout) : NULL);
                                 break;
                         }
                 }
diff --git a/swaymsg/main.c b/swaymsg/main.c
index c84f5671..716d2d2e 100644
--- a/swaymsg/main.c
+++ b/swaymsg/main.c
@@ -135,8 +135,8 @@ static void pretty_print_input(json_object *i) {
                 json_object_get_int(vendor));
 
         if (json_object_object_get_ex(i, "xkb_active_layout_name", &kbdlayout)) {
-                printf("  Active Keyboard Layout: %s\n",
-                        json_object_get_string(kbdlayout));
+                const char *layout = json_object_get_string(kbdlayout);
+                printf("  Active Keyboard Layout: %s\n", layout ? layout : "(unnamed)");
         }
 
         if (json_object_object_get_ex(i, "libinput_send_events", &events)) {