diff --git a/src/modules/xmpp/xode.c b/src/modules/xmpp/xode.c
index 4909f6345e1..8cc086aa3fe 100644
--- a/src/modules/xmpp/xode.c
+++ b/src/modules/xmpp/xode.c
@@ -343,7 +343,7 @@ xode xode_get_tag(xode parent, const char* name)
     char *str, *slash, *qmark, *equals;
     xode step, ret;
 
-    if(parent == NULL || parent->firstchild == NULL || name == NULL || name == '\0') return NULL;
+    if(parent == NULL || parent->firstchild == NULL || name == NULL || *name == '\0') return NULL;
 
     if(strstr(name, "/") == NULL && strstr(name,"?") == NULL)
         return _xode_search(parent->firstchild, name, XODE_TYPE_TAG);
diff --git a/src/modules/xmpp/xode_from.c b/src/modules/xmpp/xode_from.c
index 8a78f4ba4da..60d49fa0ca5 100644
--- a/src/modules/xmpp/xode_from.c
+++ b/src/modules/xmpp/xode_from.c
@@ -32,7 +32,7 @@ static void _xode_put_expatattribs(xode current, const char **atts)
 {
     int i = 0;
     if (atts == NULL) return;
-    while (atts[i] != '\0')
+    while (*(atts[i]) != '\0')
     {
         xode_put_attrib(current, atts[i], atts[i+1]);
         i += 2;
diff --git a/src/modules/xmpp/xstream.c b/src/modules/xmpp/xstream.c
index b4367b3aa1a..41a6c1e3861 100644
--- a/src/modules/xmpp/xstream.c
+++ b/src/modules/xmpp/xstream.c
@@ -31,7 +31,7 @@ static void _xode_put_expatattribs(xode owner, const char** atts)
 {
     int i = 0;
     if (atts == NULL) return;
-    while (atts[i] != '\0')
+    while (*(atts[i]) != '\0')
     {
         xode_put_attrib(owner, atts[i], atts[i+1]);
         i += 2;