X-Git-Url: https://git.pterodactylus.net/?p=WoTNS.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fwotns%2Fmain%2FResolver.java;h=0d94ce22fa07831be5fdcdc6d58a9df0bb92b61c;hp=0150f45b930e5de60717334306c56cbd7d7e65d8;hb=6328a49176de53708653299833bc4739dd9caacf;hpb=bba6564f0c42a461e2daf1893ad9e22b7f3afeec

diff --git a/src/main/java/net/pterodactylus/wotns/main/Resolver.java b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
index 0150f45..0d94ce2 100644
--- a/src/main/java/net/pterodactylus/wotns/main/Resolver.java
+++ b/src/main/java/net/pterodactylus/wotns/main/Resolver.java
@@ -87,7 +87,9 @@ public class Resolver {
 		}
 		@SuppressWarnings("hiding")
 		final OwnIdentity ownIdentity;
-		if (this.ownIdentityId == null) {
+		if ((this.ownIdentityId != null) && (identityManager.getOwnIdentity(this.ownIdentityId) != null)) {
+			ownIdentity = identityManager.getOwnIdentity(this.ownIdentityId);
+		} else if (this.ownIdentityId == null) {
 			Set<OwnIdentity> ownIdentities = identityManager.getAllOwnIdentities();
 			if (!ownIdentities.isEmpty()) {
 				ownIdentity = ownIdentities.iterator().next();
@@ -95,7 +97,7 @@ public class Resolver {
 				ownIdentity = null;
 			}
 		} else {
-			ownIdentity = identityManager.getOwnIdentity(ownIdentityId);
+			ownIdentity = null;
 		}
 		if (ownIdentity == null) {
 			return null;