diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/BitmapUtils.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/BitmapUtils.kt
index 15f81c08..381841c4 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/BitmapUtils.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/imageloader/BitmapUtils.kt
@@ -44,7 +44,7 @@ class BitmapUtils {
         ): Bitmap? {
             val albumArtFile = FileUtil.getAlbumArtFile(filename)
             val bitmap: Bitmap? = null
-            if (albumArtFile != null && File(albumArtFile).exists()) {
+            if (File(albumArtFile).exists()) {
                 return getBitmapFromDisk(albumArtFile, size, bitmap)
             }
             return null
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt
index 8e7fe064..31e686fc 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/FileUtil.kt
@@ -114,7 +114,7 @@ object FileUtil {
      * @param entry The album entry
      * @return File object. Not guaranteed that it exists
      */
-    fun getAlbumArtFile(entry: MusicDirectory.Child): String? {
+    fun getAlbumArtFile(entry: MusicDirectory.Child): String {
         val albumDir = getAlbumDirectory(entry)
         return getAlbumArtFileForAlbumDir(albumDir)
     }
@@ -169,7 +169,7 @@ object FileUtil {
      * @return File object. Not guaranteed that it exists
      */
     @JvmStatic
-    fun getAlbumArtFileForAlbumDir(albumDir: String): String? {
+    fun getAlbumArtFileForAlbumDir(albumDir: String): String {
         val key = getAlbumArtKey(albumDir, true)
         return getAlbumArtFile(key)
     }
@@ -180,11 +180,9 @@ object FileUtil {
      * @return File object. Not guaranteed that it exists
      */
     @JvmStatic
-    fun getAlbumArtFile(cacheKey: String?): String? {
+    fun getAlbumArtFile(cacheKey: String): String {
         val albumArtDir = albumArtDirectory.absolutePath
-        return if (cacheKey == null) {
-            null
-        } else "$albumArtDir/$cacheKey"
+        return "$albumArtDir/$cacheKey"
     }
 
     val albumArtDirectory: File