diff --git a/CHANGELOG.md b/CHANGELOG.md
index 318b29178..d1f1ce3f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Wikimedia Commons for Android
 
+## v2.12.1
+- Fixed issue with Nearby loading in wrong location
+- Various crash fixes
+
 ## v2.12.0
 - Completed codebase overhaul 
 - Added filters for place type and place state to Nearby
diff --git a/app/build.gradle b/app/build.gradle
index 2197573ab..1c9aa60e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -110,8 +110,8 @@ android {
 
     defaultConfig {
         applicationId 'fr.free.nrw.commons'
-        versionCode 508
-        versionName '2.12.0'
+        versionCode 542
+        versionName '2.12.1'
         setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
 
         minSdkVersion 19
diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
index 5ddfe7d06..f82ebd43a 100644
--- a/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/review/ReviewImageFragment.java
@@ -76,7 +76,7 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
                 false);
         ButterKnife.bind(this, layoutView);
 
-        String question, explanation, yesButtonText, noButtonText;
+        String question, explanation=null, yesButtonText, noButtonText;
         switch (position) {
             case SPAM:
                 question = getString(R.string.review_spam);
@@ -115,12 +115,17 @@ public class ReviewImageFragment extends CommonsDaggerSupportFragment {
 
                 //Get existing user name if it is already saved using savedInstanceState else get from reviewController
                 if (savedInstanceState == null) {
-                    user = getReviewActivity().reviewController.firstRevision.getUser();
+                    if (getReviewActivity().reviewController != null) {
+                        user = getReviewActivity().reviewController.firstRevision.getUser();
+                    }
                 } else {
                     user = savedInstanceState.getString(SAVED_USER);
                 }
 
-                explanation = getString(R.string.review_thanks_explanation, user);
+                //if the user is null because of whatsoever reason, review will not be sent anyways
+                if (!TextUtils.isEmpty(user)) {
+                    explanation = getString(R.string.review_thanks_explanation, user);
+                }
 
                 yesButtonText = getString(R.string.review_thanks_yes_button_text);
                 noButtonText = getString(R.string.review_thanks_no_button_text);
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index f3bd3906b..4193f7019 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -307,8 +307,9 @@
   <string name="showcase_view_plus_fab">คุณสามารถอัปโหลดรูปภาพสำหรับสถานที่ใด ๆ ได้จากแกลเลอรีหรือกล้องของคุณ</string>
   <string name="no_images_found">ไม่พบรูปภาพ!</string>
   <string name="error_loading_images">เกิดข้อผิดพลาดระหว่างการโหลดภาะ</string>
-  <string name="image_uploaded_by">อัพโหลดโดย: %1$a</string>
+
   <string name="block_notification_title">ถูกบล็อก</string>
+  <string name="image_uploaded_by">อัพโหลดโดย: %1$s</string>
   <string name="block_notification">คุณกำลังถูกบล็อคไม่ให้แก้ไขคอมมอนส์</string>
   <string name="appwidget_img">รูปภาพประจำวัน</string>
   <string name="app_widget_heading">รูปภาพประจำวัน</string>