1 files changed, 9 insertions, 8 deletions
diff --git a/Swiften/VCards/VCardManager.cpp b/Swiften/VCards/VCardManager.cpp
index 5e552d6..5fa44ae 100644
--- a/Swiften/VCards/VCardManager.cpp
+++ b/Swiften/VCards/VCardManager.cpp
@@ -1,21 +1,20 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
 
 #include <Swiften/VCards/VCardManager.h>
 
 #include <boost/bind.hpp>
 
 #include <Swiften/Base/Log.h>
 #include <Swiften/JID/JID.h>
-#include <Swiften/VCards/VCardStorage.h>
 #include <Swiften/VCards/GetVCardRequest.h>
-
+#include <Swiften/VCards/VCardStorage.h>
 
 namespace Swift {
 
 VCardManager::VCardManager(const JID& ownJID, IQRouter* iqRouter, VCardStorage* vcardStorage) : ownJID(ownJID), iqRouter(iqRouter), storage(vcardStorage) {
 }
 
@@ -50,18 +49,20 @@ void VCardManager::requestVCard(const JID& requestedJID) {
 void VCardManager::requestOwnVCard() {
 	requestVCard(JID());
 }
 
 
 void VCardManager::handleVCardReceived(const JID& actualJID, VCard::ref vcard, ErrorPayload::ref error) {
-	if (error || !vcard) {
-		vcard = VCard::ref(new VCard());
-	}
 	requestedVCards.erase(actualJID);
-	JID jid = actualJID.isValid() ? actualJID : ownJID.toBare();
-	setVCard(jid, vcard);
+	if (!error) {
+		if (!vcard) {
+			vcard = VCard::ref(new VCard());
+		}
+		JID jid = actualJID.isValid() ? actualJID : ownJID.toBare();
+		setVCard(jid, vcard);
+	}
 }
 
 SetVCardRequest::ref VCardManager::createSetVCardRequest(VCard::ref vcard) {
 	SetVCardRequest::ref request = SetVCardRequest::create(vcard, iqRouter);
 	request->onResponse.connect(boost::bind(&VCardManager::handleSetVCardResponse, this, vcard, _2));
 	return request;