X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=09e46b3defcf6b65f4b4c0db331482f2a18b6a87;hb=099ca7d98f1e557191f9e4db97d1c970a53bc062;hp=0043feb8050df91a65527827801263d86e8e8c48;hpb=f720183b01cc2f677358986cd165a0fd26a45a43;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 0043feb..09e46b3 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -528,7 +528,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	public Sone getRemoteSone(String id, boolean create) {
 		synchronized (remoteSones) {
 			Sone sone = remoteSones.get(id);
-			if ((sone == null) && create) {
+			if ((sone == null) && create && (id != null) && (id.length() == 43)) {
 				sone = new Sone(id);
 				remoteSones.put(id, sone);
 				setSoneStatus(sone, SoneStatus.unknown);
@@ -1070,7 +1070,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 					}
 				}
 			}
-			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
 			setSoneStatus(sone, SoneStatus.unknown);
 			soneDownloaders.execute(new Runnable() {