diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index d8e4d7d029b05b2566a4c65607ca3e83f54ef307..16695dea656783aa171706ab3510f21ffc2905db 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -886,7 +886,12 @@ class ConnectionVcard:
 		f = open(path_to_file)
 		c = f.read()
 		f.close()
-		card = common.xmpp.Node(node = c)
+		try:
+			card = common.xmpp.Node(node = c)
+		except:
+			# We are unable to parse it. Remove it
+			os.remove(path_to_file)
+			return None
 		vcard = self.node_to_dict(card)
 		if vcard.has_key('PHOTO'):
 			if not isinstance(vcard['PHOTO'], dict):