2 files changed, 14 insertions, 6 deletions
diff --git a/Swiften/VCards/VCardManager.cpp b/Swiften/VCards/VCardManager.cpp
index 5fa44ae..347cc3d 100644
--- a/Swiften/VCards/VCardManager.cpp
+++ b/Swiften/VCards/VCardManager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -60,6 +60,9 @@ void VCardManager::handleVCardReceived(const JID& actualJID, VCard::ref vcard, E
 		JID jid = actualJID.isValid() ? actualJID : ownJID.toBare();
 		setVCard(jid, vcard);
 	}
+	else {
+		onVCardRetrievalError(actualJID, error);
+	}
 }
 
 SetVCardRequest::ref VCardManager::createSetVCardRequest(VCard::ref vcard) {
diff --git a/Swiften/VCards/VCardManager.h b/Swiften/VCards/VCardManager.h
index 8b3075a..feed1bb 100644
--- a/Swiften/VCards/VCardManager.h
+++ b/Swiften/VCards/VCardManager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
  * All rights reserved.
  * See the COPYING file for more information.
  */
@@ -11,16 +11,16 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <Swiften/Base/API.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/Elements/VCard.h>
+#include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/Elements/ErrorPayload.h>
+#include <Swiften/Elements/VCard.h>
+#include <Swiften/JID/JID.h>
 #include <Swiften/VCards/SetVCardRequest.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 namespace Swift {
+	class IQRouter;
 	class JID;
 	class VCardStorage;
-	class IQRouter;
 
 	class SWIFTEN_API VCardManager : public boost::bsignals::trackable {
 		public:
@@ -44,6 +44,11 @@ namespace Swift {
 			boost::signal<void (const JID&, VCard::ref)> onVCardChanged;
 
 			/**
+			 * Emitted when we received an error on looking up a vCard.
+			 */
+			boost::signal<void (const JID&, ErrorPayload::ref)> onVCardRetrievalError;
+
+			/**
 			 * Emitted when our own vcard changes.
 			 *
 			 * onVCardChanged will also be emitted.