diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java
index d3e86fa6..3a796bf1 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/util/CustomArtistImageUtil.java
@@ -122,8 +122,12 @@ public class CustomArtistImageUtil {
     }
 
     private static String getFileName(Artist artist) {
+        String artistName = artist.getName();
+        if (artistName == null)
+            artistName = "";
         // replace everything that is not a letter or a number with _
-        return String.format(Locale.US, "#%d#%s.jpeg", artist.getId(), artist.getName().replaceAll("[^a-zA-Z0-9]", "_"));
+        artistName = artistName.replaceAll("[^a-zA-Z0-9]", "_");
+        return String.format(Locale.US, "#%d#%s.jpeg", artist.getId(), artistName);
     }
 
     public static File getFile(Artist artist) {