diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.kt
index 2f6b72992..a35cc15db 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsLocalDataSource.kt
@@ -34,14 +34,12 @@ class ContributionsLocalDataSource @Inject constructor(
      * @param uri
      * @return
      */
-    fun getContributionWithFileName(uri: String): Contribution? {
-        val contributionWithUri = contributionDao.getContributionWithTitle(
-            uri
-        )
-        if (!contributionWithUri.isEmpty()) {
+    fun getContributionWithFileName(uri: String): Contribution {
+        val contributionWithUri = contributionDao.getContributionWithTitle(uri)
+        if (contributionWithUri.isNotEmpty()) {
             return contributionWithUri[0]
         }
-        return null
+        throw IllegalArgumentException("Contribution not found for URI: $uri")
     }
 
     /**
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.kt
index 212e96c15..d9c8634d6 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsPresenter.kt
@@ -1,11 +1,11 @@
 package fr.free.nrw.commons.contributions
 
-import fr.free.nrw.commons.utils.ImageUtils
 import androidx.work.ExistingWorkPolicy
 import fr.free.nrw.commons.MediaDataExtractor
 import fr.free.nrw.commons.di.CommonsApplicationModule
 import fr.free.nrw.commons.repository.UploadRepository
 import fr.free.nrw.commons.upload.worker.WorkRequestHelper.Companion.makeOneTimeWorkRequest
+import fr.free.nrw.commons.utils.ImageUtils
 import io.reactivex.Scheduler
 import io.reactivex.disposables.CompositeDisposable
 import timber.log.Timber
@@ -39,7 +39,6 @@ class ContributionsPresenter @Inject internal constructor(
 
     override fun getContributionsWithTitle(title: String): Contribution {
         return contributionsRepository.getContributionWithFileName(title)
-            ?: throw IllegalArgumentException("Contribution not found for title: $title")
     }
 
     /**
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRepository.kt b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRepository.kt
index a78aff582..462dbfc7d 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRepository.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsRepository.kt
@@ -42,7 +42,7 @@ class ContributionsRepository @Inject constructor(private val localDataSource: C
      * @param fileName
      * @return
      */
-    fun getContributionWithFileName(fileName: String): Contribution? {
+    fun getContributionWithFileName(fileName: String): Contribution {
         return localDataSource.getContributionWithFileName(fileName)
     }