diff --git a/livedata-location/build.gradle b/livedata-location/build.gradle
index 9a71da0..6c331bb 100644
--- a/livedata-location/build.gradle
+++ b/livedata-location/build.gradle
@@ -15,15 +15,7 @@ configurations.configureEach {
 dependencies {
     api project(":lifecycle")
 
-    implementation "com.google.android.gms:play-services-location"
+    implementation libs.playServicesLocation
 
-    implementation "com.huawei.hms:location:$versions.hmsLocation"
-
-    constraints {
-        implementation("com.google.android.gms:play-services-location") {
-            version {
-                require '17.0.0'
-            }
-        }
-    }
+    implementation libs.hmsLocation
 }
diff --git a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/recyclerview_adapters/adapters/DelegatesManager.kt b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/recyclerview_adapters/adapters/DelegatesManager.kt
index 834d7ae..cf92bd1 100644
--- a/recyclerview-adapters/src/main/java/ru/touchin/roboswag/recyclerview_adapters/adapters/DelegatesManager.kt
+++ b/recyclerview-adapters/src/main/java/ru/touchin/roboswag/recyclerview_adapters/adapters/DelegatesManager.kt
@@ -18,7 +18,7 @@ class DelegatesManager {
                 return delegate.itemViewType
             }
         }
-        throw IllegalStateException("Delegate not found for adapterPosition: $adapterPosition")
+        throw IllegalStateException("Delegate not found for ${items[adapterPosition]?.javaClass?.canonicalName}")
     }
 
     fun getItemId(items: List<*>, adapterPosition: Int, collectionPosition: Int): Long {