X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=70478f34f3e112a55abe9337e5da70bd6a0cfd3b;hp=8238b3fc3391acc55ae1ff62fa8fdc633957d881;hb=59987c0cdf71bb2b58e0b97abe60e5d77e3cd8be;hpb=cdc43cba87ab4305ac206e5777ea415dd31e3797

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index 8238b3f..70478f3 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -21,13 +21,16 @@ import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
 import static java.util.Arrays.asList;
+import static java.util.Collections.emptyList;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import javax.annotation.Nonnull;
 
 import com.google.common.base.Function;
 import com.google.common.base.Optional;
@@ -59,7 +62,11 @@ public class Album implements Identified, Fingerprintable {
 	public static final Function<Album, List<Album>> FLATTENER = new Function<Album, List<Album>>() {
 
 		@Override
+		@Nonnull
 		public List<Album> apply(Album album) {
+			if (album == null) {
+				return emptyList();
+			}
 			List<Album> albums = new ArrayList<Album>();
 			albums.add(album);
 			for (Album subAlbum : album.getAlbums()) {
@@ -73,8 +80,9 @@ public class Album implements Identified, Fingerprintable {
 	public static final Function<Album, List<Image>> IMAGES = new Function<Album, List<Image>>() {
 
 		@Override
+		@Nonnull
 		public List<Image> apply(Album album) {
-			return album.getImages();
+			return (album != null) ? album.getImages() : Collections.<Image>emptyList();
 		}
 	};