diff -Naur xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c xfce4-xkb-plugin-0.5.3.3.tpg/panel-plugin/xkb-config.c
--- xfce4-xkb-plugin-0.5.3.3/panel-plugin/xkb-config.c	2009-03-06 13:16:03.000000000 +0000
+++ xfce4-xkb-plugin-0.5.3.3.tpg/panel-plugin/xkb-config.c	2010-02-25 17:11:48.000000000 +0000
@@ -290,7 +290,7 @@
         if (settings->kbd_config->toggle_option
                 && strlen (settings->kbd_config->toggle_option) > 0)
             options = g_strdup (settings->kbd_config->toggle_option);
-        else options = "";
+        else options = g_strdup ("");
 
         if (settings->kbd_config->compose_key_position
                 && strlen (settings->kbd_config->compose_key_position) > 0)
@@ -312,11 +312,11 @@
     {
         prefix = g_strsplit(*opt, ":", 2);
         if (settings->kbd_config->toggle_option == NULL
-                && prefix && strcmp(*prefix, "grp") == 0)
+                && prefix && *prefix && strcmp(*prefix, "grp") == 0)
         {
             settings->kbd_config->toggle_option = g_strdup (*opt);
         }
-        else if (prefix && strcmp(*prefix, "compose") == 0)
+        else if (prefix && *prefix && strcmp(*prefix, "compose") == 0)
         {
             settings->kbd_config->compose_key_position = g_strdup (*opt);
         }