diff --git a/gradle_scripts/code_quality.gradle b/gradle_scripts/code_quality.gradle
index 5c991fcf..2d4226eb 100644
--- a/gradle_scripts/code_quality.gradle
+++ b/gradle_scripts/code_quality.gradle
@@ -31,5 +31,4 @@ if (isCodeQualityEnabled) {
         }
         tasks.detekt.jvmTarget = "11"
     }
-
 }
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt
index 535bfb59..a387b8b1 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionFragment.kt
@@ -600,14 +600,17 @@ open class TrackCollectionFragment(
                 listModel.getRandom(size, append)
             } else {
                 setTitle(name)
+                requireNotNull(id) {
+                    "ID must be set. NavArgs: ${navArgs.toBundle()}"
+                }
                 if (ActiveServerProvider.isID3Enabled()) {
                     if (isAlbum) {
-                        listModel.getAlbum(refresh2, id!!, name)
+                        listModel.getAlbum(refresh2, id, name)
                     } else {
                         throw IllegalAccessException("Use AlbumFragment instead!")
                     }
                 } else {
-                    listModel.getMusicDirectory(refresh2, id!!, name)
+                    listModel.getMusicDirectory(refresh2, id, name)
                 }
             }
 
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CommunicationError.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CommunicationError.kt
index 917afda5..f81e7b92 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CommunicationError.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/util/CommunicationError.kt
@@ -39,14 +39,14 @@ object CommunicationError {
     }
 
     @JvmStatic
-    fun handleError(error: Throwable?, context: Context?) {
+    fun handleError(error: Throwable, context: Context?) {
         Timber.w(error)
 
         if (context == null) return
 
         ErrorDialog(
             context = context,
-            message = getErrorMessage(error!!, context)
+            message = getErrorMessage(error, context)
         ).show()
     }