diff --git a/xfsettingsd/keyboard-layout.c b/xfsettingsd/keyboard-layout.c
index f4ee672..0c007e6 100644
--- a/xfsettingsd/keyboard-layout.c
+++ b/xfsettingsd/keyboard-layout.c
@@ -298,7 +298,9 @@ xfce_keyboard_layout_get_option (gchar **options,
         }
     }
 
-    *_other_options = other_options;
+    if (_other_options)
+        *_other_options = other_options;
+
     return option_value;
 }