diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
index b01d320be..22cff86ce 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/ImageUploader.kt
@@ -123,14 +123,17 @@ class ImageUploader(val account: Account?) {
             client.newCall(request).enqueue(object : Callback {
                 override fun onResponse(call: Call, response: Response) {
                     try {
-                        check(response.isSuccessful)
-                        response.body.use { body ->
-                            val url = server.parseUrlFromSuccess(body.string(), authorizationToken)
-                            checkNotNull(url) {
-                                "There must be an uploaded image URL in the response"
-                            }
+                        if (response.isSuccessful) {
+                            response.body.use { body ->
+                                val url = server.parseUrlFromSuccess(body.string(), authorizationToken)
+                                checkNotNull(url) {
+                                    "There must be an uploaded image URL in the response"
+                                }
 
-                            onSuccess(url, contentType)
+                                onSuccess(url, contentType)
+                            }
+                        } else {
+                            onError(RuntimeException("Error Uploading image: ${response.code}"))
                         }
                     } catch (e: Exception) {
                         e.printStackTrace()