diff --git a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
index 7f6ea7027..1085865df 100644
--- a/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
+++ b/app/src/main/java/fr/free/nrw/commons/db/AppDatabase.kt
@@ -14,7 +14,7 @@ import fr.free.nrw.commons.upload.depicts.DepictsDao
  * The database for accessing the respective DAOs
  *
  */
-@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class], version = 8, exportSchema = false)
+@Database(entities = [Contribution::class, Depicts::class, UploadedStatus::class], version = 9, exportSchema = false)
 @TypeConverters(Converters::class)
 abstract class AppDatabase : RoomDatabase() {
     abstract fun contributionDao(): ContributionDao
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java b/app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java
index 60b4a02c8..dc26b939d 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/PageContentsCreator.java
@@ -26,24 +26,28 @@ class PageContentsCreator {
     private final Context context;
 
     @Inject
-    public PageContentsCreator(Context context) {
+    public PageContentsCreator(final Context context) {
         this.context = context;
     }
 
-    public String createFrom(Contribution contribution, String countryCode) {
+    public String createFrom(final Contribution contribution, final String countryCode) {
         StringBuilder buffer = new StringBuilder();
         final Media media = contribution.getMedia();
         buffer
             .append("== {{int:filedesc}} ==\n")
             .append("{{Information\n")
-            .append("|description=").append(media.getFallbackDescription())
-            .append("{{ on Wikidata|").append(contribution.getWikidataPlace().getId()).append("}}")
+            .append("|description=").append(media.getFallbackDescription()).append("\n");
+        if (contribution.getWikidataPlace() != null) {
+            buffer.append("{{ on Wikidata|").append(contribution.getWikidataPlace().getId())
+                .append("}}");
+        }
+        buffer
             .append("\n")
             .append("|source=").append("{{own}}\n")
             .append("|author=[[User:").append(media.getAuthor()).append("|")
             .append(media.getAuthor()).append("]]\n");
 
-        String templatizedCreatedDate = getTemplatizedCreatedDate(
+        final String templatizedCreatedDate = getTemplatizedCreatedDate(
             contribution.getDateCreated(), contribution.getDateCreatedSource());
         if (!StringUtils.isBlank(templatizedCreatedDate)) {
             buffer.append("|date=").append(templatizedCreatedDate);
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
index d46c5e4ac..cec598eaa 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
+++ b/app/src/main/java/fr/free/nrw/commons/upload/worker/UploadWorker.kt
@@ -290,7 +290,7 @@ class UploadWorker(var appContext: Context, workerParams: WorkerParameters) :
                         //Upload the file from stash
                             var countryCode: String? =null
                             with(contribution.wikidataPlace?.location){
-                                if(contribution.wikidataPlace?.isMonumentUpload!!) {
+                                if (contribution.wikidataPlace?.isMonumentUpload == true) {
                                     countryCode =
                                         reverseGeoCode(contribution.wikidataPlace?.location!!)?.toLowerCase()
                                 }