X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FAlbum.java;h=44b37b77c40d64c1d39a0737826d0fdb3e90656d;hp=9d990fe4f4b8711d7db254c629634c1e81d4e667;hb=0acd68634f3e73c62087609c1faa2dfc53da506d;hpb=7dabe8b7c6ad1c3fceec861efa92c3a6c6225db6

diff --git a/src/main/java/net/pterodactylus/sone/data/Album.java b/src/main/java/net/pterodactylus/sone/data/Album.java
index 9d990fe..44b37b7 100644
--- a/src/main/java/net/pterodactylus/sone/data/Album.java
+++ b/src/main/java/net/pterodactylus/sone/data/Album.java
@@ -24,8 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import net.pterodactylus.util.collection.Mapper;
-import net.pterodactylus.util.collection.Mappers;
+import net.pterodactylus.util.collection.IterableWrapper;
+import net.pterodactylus.util.collection.filter.NotNullFilter;
+import net.pterodactylus.util.collection.mapper.Mapper;
 import net.pterodactylus.util.object.Default;
 import net.pterodactylus.util.validation.Validation;
 
@@ -207,7 +208,7 @@ public class Album implements Fingerprintable {
 	 * @return The images in this album
 	 */
 	public List<Image> getImages() {
-		return Mappers.mappedList(imageIds, new Mapper<String, Image>() {
+		return IterableWrapper.wrap(imageIds).map(new Mapper<String, Image>() {
 
 			@Override
 			@SuppressWarnings("synthetic-access")
@@ -215,7 +216,7 @@ public class Album implements Fingerprintable {
 				return images.get(imageId);
 			}
 
-		});
+		}).filter(new NotNullFilter()).list();
 	}
 
 	/**