diff --git a/app/build.gradle b/app/build.gradle
index dba4704e16..2bbb2ae2c6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ configurations.configureEach {
     exclude module: "commons-logging"
 }
 
-def canonicalVersionCode = 402
-def canonicalVersionName = "1.22.0"
+def canonicalVersionCode = 403
+def canonicalVersionName = "1.22.1"
 
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt
index adf4f0345b..be90d0eea3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.kt
@@ -210,7 +210,7 @@ class ApplicationContext : Application(), DefaultLifecycleObserver,
             .setWorkerFactory(workerFactory)
             .build()
 
-    override fun getSystemService(name: String): Any {
+    override fun getSystemService(name: String): Any? {
         if (MessagingModuleConfiguration.MESSAGING_MODULE_SERVICE == name) {
             return messagingModuleConfiguration!!
         }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 293e2b9ee0..1af080236d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -429,9 +429,12 @@ public class MediaPreviewActivity extends ScreenLockActionBarActivity implements
     String mediaFilename = "";
     if (mediaItem.attachment != null) {
       mediaFilename = mediaItem.attachment.getFilename();
-    } else {
+    }
+
+    if(mediaFilename == null || mediaFilename.isEmpty()){
       mediaFilename = FilenameUtils.getFilenameFromUri(MediaPreviewActivity.this, mediaItem.uri, mediaItem.mimeType);
     }
+
     final String outputFilename = mediaFilename; // We need a `final` value for the saveTask, below
     Log.i(TAG, "About to save media as: " + outputFilename);