diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
index 8fecffb9e..132a8041b 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/MainActivity.kt
@@ -242,7 +242,7 @@ open class MainActivity : FlutterFragmentActivity() {
 
     private fun onEditResult(resultCode: Int, intent: Intent?) {
         val fields: FieldMap? = if (resultCode == RESULT_OK) hashMapOf(
-            "uri" to intent?.data.toString(),
+            "uri" to intent?.data?.toString(),
             "mimeType" to intent?.type,
         ) else null
         pendingEditIntentHandler?.let { it(fields) }
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaFetchObjectHandler.kt b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaFetchObjectHandler.kt
index d0d317c2a..941928831 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaFetchObjectHandler.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/channel/calls/MediaFetchObjectHandler.kt
@@ -36,13 +36,13 @@ class MediaFetchObjectHandler(private val context: Context) : MethodCallHandler
 
         val provider = getProvider(context, uri)
         if (provider == null) {
-            result.error("getEntry-provider", "failed to find provider for uri=$uri", null)
+            result.error("getEntry-provider", "failed to find provider for uri=$uri mimeType=$mimeType", null)
             return
         }
 
         provider.fetchSingle(context, uri, mimeType, object : ImageOpCallback {
             override fun onSuccess(fields: FieldMap) = result.success(fields)
-            override fun onFailure(throwable: Throwable) = result.error("getEntry-failure", "failed to get entry for uri=$uri", throwable.message)
+            override fun onFailure(throwable: Throwable) = result.error("getEntry-failure", "failed to get entry for uri=$uri mimeType=$mimeType", throwable.message)
         })
     }