diff --git a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
index 10b12aa23..d762c19d2 100644
--- a/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/loading/LoadingFragment.kt
@@ -56,9 +56,7 @@ class LoadingFragment : Fragment() {
                 null -> showLoading(binding)
 
                 // Anything else is an error
-                else -> {
-                    showError(binding, response)
-                }
+                else -> showError(binding, response)
             }
         }
 
diff --git a/app/src/main/java/org/oxycblt/auxio/music/Models.kt b/app/src/main/java/org/oxycblt/auxio/music/Models.kt
index 5d3d86b3b..caa7dde22 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/Models.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/Models.kt
@@ -55,22 +55,20 @@ data class Song(
 
     /**
      * Apply a genre to a song.
-     * @throws IllegalStateException When a genre is already applied.
      */
     fun applyGenre(genre: Genre) {
-        check(mGenre == null) { "Genre is already applied" }
-
-        mGenre = genre
+        if (mGenre == null) {
+            mGenre = genre
+        }
     }
 
     /**
      * Apply an album to a song.
-     * @throws IllegalStateException When an album is already applied.
      */
     fun applyAlbum(album: Album) {
-        check(mAlbum == null) { "Album is already applied" }
-
-        mAlbum = album
+        if (mAlbum == null) {
+            mAlbum = album
+        }
     }
 
     val seconds = duration / 1000