diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index 46da0b676..e601d9b96 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1289,9 +1289,11 @@ public class XmppConnectionService extends Service {
 
 	public Contact findContact(String uuid) {
 		Contact contact = this.databaseBackend.getContact(uuid);
-		for (Account account : getAccounts()) {
-			if (contact.getAccountUuid().equals(account.getUuid())) {
-				contact.setAccount(account);
+		if (contact!=null) {
+			for (Account account : getAccounts()) {
+				if (contact.getAccountUuid().equals(account.getUuid())) {
+					contact.setAccount(account);
+				}
 			}
 		}
 		return contact;