X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=81c51853f95f198d22d40c5c164365d47caa53ca;hb=5bc04b55aa0bd5f9f9a3d01b8989b73fa8fa1f85;hp=b612c740a5a07588546436bf42009e5eba79b980;hpb=c21a3eda7b784f1c5b39ed12a5ce983d2bf62166;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 b612c74..81c5185 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1061,6 +1061,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 	 */
 	public void followSone(Sone sone, String soneId) {
 		Validation.begin().isNotNull("Sone", sone).isNotNull("Sone ID", soneId).check();
+		Sone followedSone = getSone(soneId, true);
+		if (followedSone == null) {
+			logger.log(Level.INFO, String.format("Ignored Sone with invalid ID: %s", soneId));
+			return;
+		}
 		followSone(sone, getSone(soneId));
 	}
 
@@ -2409,8 +2414,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
 				break;
 			}
 			long time = configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").getValue(Long.MAX_VALUE);
-			synchronized (soneFollowingTimes) {
-				soneFollowingTimes.put(getSone(soneId), time);
+			Sone followedSone = getSone(soneId);
+			if (followedSone == null) {
+				logger.log(Level.WARNING, String.format("Ignoring Sone with invalid ID: %s", soneId));
+			} else {
+				synchronized (soneFollowingTimes) {
+					soneFollowingTimes.put(getSone(soneId), time);
+				}
 			}
 			++soneCounter;
 		}