X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FIdentified.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FIdentified.java;h=489247994643559ce73fc596a86453832fa18661;hp=f12f842a7938981a8ba07848dee9f77ff0abfa9f;hb=59987c0cdf71bb2b58e0b97abe60e5d77e3cd8be;hpb=cdc43cba87ab4305ac206e5777ea415dd31e3797

diff --git a/src/main/java/net/pterodactylus/sone/data/Identified.java b/src/main/java/net/pterodactylus/sone/data/Identified.java
index f12f842..4892479 100644
--- a/src/main/java/net/pterodactylus/sone/data/Identified.java
+++ b/src/main/java/net/pterodactylus/sone/data/Identified.java
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.data;
 
+import javax.annotation.Nonnull;
+
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 
@@ -31,8 +33,9 @@ public interface Identified {
 	public static final Function<Optional<? extends Identified>, Optional<String>> GET_ID = new Function<Optional<? extends Identified>, Optional<String>>() {
 
 		@Override
+		@Nonnull
 		public Optional<String> apply(Optional<? extends Identified> identified) {
-			return identified.isPresent() ? Optional.of(identified.get().getId()) : Optional.<String>absent();
+			return (identified == null) ? Optional.<String>absent() : (identified.isPresent() ? Optional.of(identified.get().getId()) : Optional.<String>absent());
 		}
 	};