diff --git a/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt b/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt
index 9aa210fa..5991fd73 100644
--- a/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt
+++ b/src/main/kotlin/com/looker/droidify/screen/EditRepositoryFragment.kt
@@ -474,8 +474,9 @@ class EditRepositoryFragment() : ScreenFragment() {
                     .observeOn(AndroidSchedulers.mainThread())
                     .subscribe { result, throwable ->
                         checkDisposable = null
-                        throwable.printStackTrace()
-                        val resultAddress = if (result.isEmpty()) address else result
+                        throwable?.printStackTrace()
+                        val resultAddress =
+                            result?.let { if (it.isEmpty()) null else it } ?: address
                         val allow = resultAddress == address || run {
                             layout.address.setText(resultAddress)
                             invalidateAddress(resultAddress)