diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt
index 2bad51da4..0996f0a5d 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/PermissionManager.kt
@@ -250,8 +250,8 @@ object PermissionManager {
             for (uriPermission in context.contentResolver.persistedUriPermissions) {
                 val uri = uriPermission.uri
                 val path = StorageUtils.convertTreeDocumentUriToDirPath(context, uri)
-                if (path != null && !File(path).exists()) {
-                    Log.d(LOG_TAG, "revoke URI permission for obsolete path=$path")
+                if (path == null || !File(path).exists()) {
+                    Log.d(LOG_TAG, "revoke URI permission for obsolete uri=$uri path=$path")
                     releaseUriPermission(context, uri)
                 }
             }
diff --git a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
index 457a36e0e..2a9171de3 100644
--- a/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
+++ b/android/app/src/main/kotlin/deckers/thibault/aves/utils/StorageUtils.kt
@@ -693,7 +693,7 @@ object StorageUtils {
     class PathSegments(context: Context, fullPath: String) {
         var volumePath: String? = null // `volumePath` with trailing "/"
         var relativeDir: String? = null // `relativeDir` with trailing "/"
-        var fileName: String? = null // null for directories
+        private var fileName: String? = null // null for directories
 
         init {
             volumePath = getVolumePath(context, fullPath)