diff --git a/android_sdk/src/main/java/co/optable/sdk/core/IdentifiersEncoder.kt b/android_sdk/src/main/java/co/optable/sdk/core/IdentifiersEncoder.kt
index 17f2736..2d1fa48 100644
--- a/android_sdk/src/main/java/co/optable/sdk/core/IdentifiersEncoder.kt
+++ b/android_sdk/src/main/java/co/optable/sdk/core/IdentifiersEncoder.kt
@@ -120,7 +120,7 @@ internal class IdentifiersEncoder(
 
             return "e:$id"
         } catch (e: Exception) {
-            Log.e("OptableSDK", "Can't get eid from $urlString", e)
+            Log.e("OptableSDK", "Can't get eid from deep link", e)
         }
         return null
     }
diff --git a/android_sdk/src/main/java/co/optable/sdk/core/network/NetworkClient.kt b/android_sdk/src/main/java/co/optable/sdk/core/network/NetworkClient.kt
index 5e961d7..c98eb0a 100644
--- a/android_sdk/src/main/java/co/optable/sdk/core/network/NetworkClient.kt
+++ b/android_sdk/src/main/java/co/optable/sdk/core/network/NetworkClient.kt
@@ -85,7 +85,7 @@ internal class NetworkClient(
                 if (response.isSuccessful) {
                     return@withContext NetworkResponse.Success(response.body()!!)
                 } else {
-                    return@withContext NetworkResponse.Error("Request failed with status code $response: ${response.errorBody()}")
+                    return@withContext NetworkResponse.Error("Request failed with status code ${response.code()}: ${response.errorBody()?.string()}")
                 }
             }
         }
diff --git a/android_sdk/src/test/java/co/optable/sdk/core/network/NetworkClientTest.kt b/android_sdk/src/test/java/co/optable/sdk/core/network/NetworkClientTest.kt
index bd8246e..85d16e4 100644
--- a/android_sdk/src/test/java/co/optable/sdk/core/network/NetworkClientTest.kt
+++ b/android_sdk/src/test/java/co/optable/sdk/core/network/NetworkClientTest.kt
@@ -9,6 +9,7 @@ import io.mockk.mockk
 import kotlinx.coroutines.runBlocking
 import okhttp3.ResponseBody
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
@@ -59,7 +60,7 @@ class NetworkClientTest {
 
     @Test
     fun identify_shouldReturnError_whenApiCallIsUnsuccessful() = runBlocking {
-        val errorBody = ResponseBody.create(null, "Error")
+        val errorBody = ResponseBody.create(null, """{"error":"Tenant not found"}""")
         val expectedResponse: Response<Unit> = Response.error(404, errorBody)
 
         `when`(mockEdgeService.identify(emptyList())).thenReturn(expectedResponse)
@@ -67,6 +68,11 @@ class NetworkClientTest {
         val result = networkClient.identify(emptyList())
 
         assertTrue(result is NetworkResponse.Error)
+        val message = (result as NetworkResponse.Error).message
+        assertTrue(message.contains("404"))
+        assertTrue(message.contains("Tenant not found"))
+        assertFalse(message.contains("url="))
+        assertFalse(message.contains("localhost"))
     }
 
     @Test