diff --git a/src/lib/eldbus/eldbus_message.c b/src/lib/eldbus/eldbus_message.c
index 820afed13d..d6b18d3596 100644
--- a/src/lib/eldbus/eldbus_message.c
+++ b/src/lib/eldbus/eldbus_message.c
@@ -710,8 +710,11 @@ eldbus_message_iter_get_and_next(Eldbus_Message_Iter *iter, char signature, ...)
      {
         if (signature == '(') signature = 'r';
         else if (signature == '{') signature = 'e';
-        va_end(vl);
-        EINA_SAFETY_ON_FALSE_RETURN_VAL(type == signature, EINA_FALSE);
+        if (type != signature)
+          {
+             va_end(vl);
+             return EINA_FALSE;
+          }
      }
 
    if (dbus_type_is_basic(type))