diff --git a/app/src/main/java/foundation/e/apps/data/application/downloadInfo/DownloadInfoApiImpl.kt b/app/src/main/java/foundation/e/apps/data/application/downloadInfo/DownloadInfoApiImpl.kt
index 29f06a99911bb1c6470fbd5ba5610518363aca09..70f817427223b40b1220e6620c1bcd9ae227083f 100644
--- a/app/src/main/java/foundation/e/apps/data/application/downloadInfo/DownloadInfoApiImpl.kt
+++ b/app/src/main/java/foundation/e/apps/data/application/downloadInfo/DownloadInfoApiImpl.kt
@@ -22,6 +22,7 @@ import foundation.e.apps.data.AppSourcesContainer
 import foundation.e.apps.data.cleanapk.CleanApkDownloadInfoFetcher
 import foundation.e.apps.data.enums.Origin
 import foundation.e.apps.data.fusedDownload.models.FusedDownload
+import foundation.e.apps.data.handleNetworkResult
 import javax.inject.Inject
 
 class DownloadInfoApiImpl @Inject constructor(
@@ -34,16 +35,20 @@ class DownloadInfoApiImpl @Inject constructor(
         versionCode: Int,
         offerType: Int
     ): String? {
-        val list = appSources.gplayRepo.getOnDemandModule(
-            packageName,
-            moduleName,
-            versionCode,
-            offerType,
-        )
+        val result = handleNetworkResult {
+            appSources.gplayRepo.getOnDemandModule(
+                packageName,
+                moduleName,
+                versionCode,
+                offerType,
+            )
+        }
 
-        for (element in list) {
-            if (element.name == "$moduleName.apk") {
-                return element.url
+        if (result.isSuccess()) {
+            for (element in result.data!!) { // isSuccess() checks ensures null safety of data
+                if (element.name == "$moduleName.apk") {
+                    return element.url
+                }
             }
         }