diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
index 92fab56aff..d623730abf 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/Contribution.kt
@@ -101,7 +101,7 @@ data class Contribution constructor(
          */
         fun formatCaptions(uploadMediaDetails: List<UploadMediaDetail>) =
             uploadMediaDetails
-                .associate { it.languageCode!! to it.captionText!! }
+                .associate { it.languageCode!! to it.captionText }
                 .filter { it.value.isNotBlank() }
 
         /**
diff --git a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
index 942946a6bf..44cefe4d57 100644
--- a/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
+++ b/app/src/main/java/fr/free/nrw/commons/description/DescriptionEditActivity.kt
@@ -267,11 +267,11 @@ class DescriptionEditActivity :
                             applicationContext,
                             media,
                             mediaDetail.languageCode!!,
-                            mediaDetail.captionText!!,
+                            mediaDetail.captionText,
                         ).subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe { s: Boolean? ->
-                            updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!!
+                            updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
                             media.captions = updatedCaptions
                             Timber.d("Caption is added.")
                         },
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
index 084af4da9a..8c29f99398 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.kt
@@ -1586,7 +1586,7 @@ class MediaDetailFragment : CommonsDaggerSupportFragment(), CategoryEditHelper.C
         mediaDetail: UploadMediaDetail,
         updatedCaptions: MutableMap<String, String>
     ) {
-        updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText!!
+        updatedCaptions[mediaDetail.languageCode!!] = mediaDetail.captionText
         media!!.captions = updatedCaptions
     }
 
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt
index a2b3168ecd..351e531244 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadMediaDetail.kt
@@ -23,14 +23,14 @@ data class UploadMediaDetail(
      * The caption text for the item being uploaded.
      * @param captionText The caption text.
      */
-    var captionText: String? = "",
+    var captionText: String = "",
 ) : Parcelable {
     fun javaCopy() = copy()
 
     constructor(place: Place?) : this(
         place?.language,
         place?.longDescription,
-        place?.name,
+        place?.name ?: "",
     )
 
     /**
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt b/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt
index 7536cad754..dbeeae6ff7 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/categories/CategoriesPresenter.kt
@@ -140,7 +140,7 @@ class CategoriesPresenter
          */
         private fun getImageTitleList(): List<String> =
             repository.getUploads()
-                .map { it.uploadMediaDetails[0].captionText!! }
+                .map { it.uploadMediaDetails[0].captionText }
                 .filterNot { TextUtils.isEmpty(it) }
 
         /**