diff --git a/src/modules/xkbswitch/e_mod_parse.c b/src/modules/xkbswitch/e_mod_parse.c
index 16b107d76..2d3626cff 100644
--- a/src/modules/xkbswitch/e_mod_parse.c
+++ b/src/modules/xkbswitch/e_mod_parse.c
@@ -209,7 +209,7 @@ parse_rules(void)
              while (p[0] == ' ') ++p;
 
              /* skip "grp" options for switching kbd layouts */
-             if (!(!strncmp(name, "grp", 3)))
+             if (strncmp(name, "grp", 3))
                {
                   if (!strchr(name, ':'))
                     {
@@ -228,7 +228,7 @@ parse_rules(void)
 
                        optgroups = eina_list_append(optgroups, group);
                     }
-                  else
+                  else if (group)
                     {
                        option = E_NEW(E_XKB_Option, 1);
                        option->name = eina_stringshare_add(name);