diff --git a/twidere/build.gradle b/twidere/build.gradle
index 1477ab9f5..49befb6e2 100644
--- a/twidere/build.gradle
+++ b/twidere/build.gradle
@@ -36,8 +36,8 @@ android {
         applicationId "org.mariotaku.twidere"
         minSdkVersion project.properties['overrideMinSdkVersion'] ?: 14
         targetSdkVersion 25
-        versionCode 301
-        versionName '3.4.39'
+        versionCode 302
+        versionName '3.4.40'
         multiDexEnabled true
 
         buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")'
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/task/ProgressSaveFileTask.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/task/ProgressSaveFileTask.kt
index d133925df..bd1567707 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/task/ProgressSaveFileTask.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/task/ProgressSaveFileTask.kt
@@ -35,6 +35,7 @@ abstract class ProgressSaveFileTask(
 ) : SaveFileTask(context, destination, fileInfo) {
 
     override fun showProgress() {
+        val context = this.context ?: return
         (context as IBaseActivity<*>).executeAfterFragmentResumed { activity ->
             val fragment = ProgressDialogFragment()
             fragment.isCancelable = false
@@ -43,6 +44,7 @@ abstract class ProgressSaveFileTask(
     }
 
     override fun dismissProgress() {
+        val context = this.context ?: return
         (context as IBaseActivity<*>).executeAfterFragmentResumed { activity ->
             val fm = activity.supportFragmentManager
             val fragment = fm.findFragmentByTag(PROGRESS_FRAGMENT_TAG) as? DialogFragment