# HG changeset patch
# Parent 4a280882c2923b95a50f309cb2cf566bd878b05f

diff --git a/res/res_jabber.c b/res/res_jabber.c
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -2008,6 +2008,12 @@
 	struct aji_resource *resource = NULL;
 	struct aji_buddy *buddy = ASTOBJ_CONTAINER_FIND(&client->buddies, pak->from->partial);
 
+    if (!buddy) {
+        ast_log(LOG_NOTICE, "JABBER: Received client info from unknown buddy: %s.\n", pak->from->full);
+        ASTOBJ_UNREF(client, ast_aji_client_destroy);
+        return IKS_FILTER_EAT;
+    }
+
 	resource = aji_find_resource(buddy, pak->from->resource);
 	if (pak->subtype == IKS_TYPE_RESULT) {
 		if (!resource) {