diff --git a/app/src/main/java/com/etesync/syncadapter/AccountSettings.kt b/app/src/main/java/com/etesync/syncadapter/AccountSettings.kt
index 99b18e2b..1d65376c 100644
--- a/app/src/main/java/com/etesync/syncadapter/AccountSettings.kt
+++ b/app/src/main/java/com/etesync/syncadapter/AccountSettings.kt
@@ -36,8 +36,12 @@ constructor(internal val context: Context, internal val account: Account) {
 
     var uri: URI?
         get() {
+            val uri = accountManager.getUserData(account, KEY_URI)
+            if (uri == null) {
+                return null
+            }
             try {
-                return URI(accountManager.getUserData(account, KEY_URI))
+                return URI(uri)
             } catch (e: URISyntaxException) {
                 return null
             }