diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt b/app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt
index 19ad179a1..f822540a9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt
@@ -49,6 +49,4 @@ open class Playlist(
         result = 31 * result + name.hashCode()
         return result
     }
-
-
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt
index 5f215670a..004dfa370 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt
@@ -17,7 +17,6 @@ package code.name.monkey.retromusic.repository
 import android.content.ContentResolver
 import android.database.Cursor
 import android.provider.BaseColumns
-import android.provider.MediaStore
 import android.provider.MediaStore.Audio.AudioColumns
 import android.provider.MediaStore.Audio.Playlists.*
 import android.provider.MediaStore.Audio.PlaylistsColumns
@@ -120,13 +119,18 @@ class RealPlaylistRepository(
     private fun getPlaylistFromCursorImpl(
         cursor: Cursor
     ): Playlist {
-        val id = cursor.getLong(MediaStore.MediaColumns._ID)
-        val name = cursor.getString(NAME)
-        return Playlist(id, name)
+        val id = cursor.getLong(0)
+        val name = cursor.getString(1)
+        return if (name != null) {
+            Playlist(id, name)
+        } else {
+            Playlist.empty
+        }
     }
 
     override fun playlistSongs(playlistId: Long): List<Song> {
         val songs = arrayListOf<Song>()
+        if (playlistId == -1L) return songs
         val cursor = makePlaylistSongCursor(playlistId)
 
         if (cursor != null && cursor.moveToFirst()) {