diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
index 0542e0b59..b04f035fc 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicRepository.kt
@@ -247,7 +247,8 @@ constructor(
             ?: userLibrary?.findPlaylist(uid))
 
     override fun createPlaylist(name: String, songs: List<Song>) {
-        userLibrary?.createPlaylist(name, songs)
+        val userLibrary = userLibrary ?: return
+        userLibrary.createPlaylist(name, songs)
         for (listener in updateListeners) {
             listener.onMusicChanges(
                 MusicRepository.Changes(deviceLibrary = false, userLibrary = true))
diff --git a/app/src/test/java/org/oxycblt/auxio/music/FakeMusicRepository.kt b/app/src/test/java/org/oxycblt/auxio/music/FakeMusicRepository.kt
index b3ae9e553..2d113a3f1 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/FakeMusicRepository.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/FakeMusicRepository.kt
@@ -58,6 +58,10 @@ open class FakeMusicRepository : MusicRepository {
         throw NotImplementedError()
     }
 
+    override fun createPlaylist(name: String, songs: List<Song>) {
+        throw NotImplementedError()
+    }
+
     override fun requestIndex(withCache: Boolean) {
         throw NotImplementedError()
     }
diff --git a/gradle.properties b/gradle.properties
index f6e147bcb..855d32826 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,3 +19,4 @@ android.useAndroidX=true
 android.enableJetifier=false
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.enableR8.fullMode=true
\ No newline at end of file