diff --git a/tunnel/build.gradle.kts b/tunnel/build.gradle.kts
index 589d72da..2956395f 100644
--- a/tunnel/build.gradle.kts
+++ b/tunnel/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 36
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
index 5cdcb6a1..679e7c46 100644
--- a/ui/build.gradle.kts
+++ b/ui/build.gradle.kts
@@ -12,7 +12,7 @@ plugins {
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 36
     buildFeatures {
         buildConfig = true
         dataBinding = true
@@ -22,7 +22,7 @@ android {
     defaultConfig {
         applicationId = pkg
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 36
         versionCode = providers.gradleProperty("wireguardVersionCode").get().toInt()
         versionName = providers.gradleProperty("wireguardVersionName").get()
         buildConfigField("int", "MIN_SDK_VERSION", minSdk.toString())
diff --git a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
index 1cd19934..4259e8e3 100644
--- a/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
+++ b/ui/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.kt
@@ -48,7 +48,7 @@ class AppListDialogFragment : DialogFragment() {
                     val packageInfos = getPackagesHoldingPermissions(pm, arrayOf(Manifest.permission.INTERNET))
                     packageInfos.forEach {
                         val packageName = it.packageName
-                        val appInfo = it.applicationInfo
+                        val appInfo = it.applicationInfo ?: return@forEach
                         val appData =
                             ApplicationData(appInfo.loadIcon(pm), appInfo.loadLabel(pm).toString(), packageName, currentlySelectedApps.contains(packageName))
                         applicationData.add(appData)
diff --git a/ui/src/main/java/com/wireguard/android/updater/Updater.kt b/ui/src/main/java/com/wireguard/android/updater/Updater.kt
index 651e3cd7..79e9bc0e 100644
--- a/ui/src/main/java/com/wireguard/android/updater/Updater.kt
+++ b/ui/src/main/java/com/wireguard/android/updater/Updater.kt
@@ -376,12 +376,12 @@ object Updater {
         if (installerIsGooglePlay(context))
             return
 
-        if (!if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+        if (if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
                 @Suppress("DEPRECATION")
                 context.packageManager.getPackageInfo(context.packageName, PackageManager.GET_PERMISSIONS)
             } else {
                 context.packageManager.getPackageInfo(context.packageName, PackageManager.PackageInfoFlags.of(PackageManager.GET_PERMISSIONS.toLong()))
-            }.requestedPermissions.contains(Manifest.permission.REQUEST_INSTALL_PACKAGES)
+            }.requestedPermissions?.contains(Manifest.permission.REQUEST_INSTALL_PACKAGES) != true
         ) {
             if (installer(context).isNotEmpty()) {
                 updaterScope.launch {