diff --git a/dependencies.gradle b/dependencies.gradle
index d3070c20..b38166a5 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,7 +1,7 @@
 ext.versions = [
         minSdk               : 14,
         targetSdk            : 22,
-        compileSdk           : 27,
+        compileSdk           : 28,
         gradle               : '4.5.1',
 
         androidTools         : "3.1.3",
diff --git a/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandler.kt b/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandler.kt
index afce254e..f74f0bcf 100644
--- a/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandler.kt
+++ b/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/AvatarRequestHandler.kt
@@ -23,6 +23,7 @@ class AvatarRequestHandler(
 
     override fun load(request: Request, networkPolicy: Int): Result {
         val username = request.uri.getQueryParameter(QUERY_USERNAME)
+            ?: throw IllegalArgumentException("Nullable username")
 
         val response = apiClient.getAvatar(username)
         if (response.hasError()) {
diff --git a/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandler.kt b/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandler.kt
index 8c6f4cd3..a12d1700 100644
--- a/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandler.kt
+++ b/subsonic-api-image-loader/src/main/kotlin/org/moire/ultrasonic/subsonic/loader/image/CoverArtRequestHandler.kt
@@ -20,7 +20,7 @@ class CoverArtRequestHandler(private val apiClient: SubsonicAPIClient) : Request
     }
 
     override fun load(request: Request, networkPolicy: Int): Result {
-        val id = request.uri.getQueryParameter(QUERY_ID)
+        val id = request.uri.getQueryParameter(QUERY_ID) ?: throw IllegalArgumentException("Nullable id")
 
         val response = apiClient.getCoverArt(id)
         if (response.hasError()) {