diff --git a/app/build.gradle b/app/build.gradle
index 924b9e142..74dd1c913 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,8 +38,8 @@ android {
         targetSdkVersion 28
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 115
-        versionName "7.0.1"
+        versionCode 116
+        versionName "7.0.2"
 
         flavorDimensions "default"
         renderscriptTargetApi 19
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
index cb210bda8..87ebdd922 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
@@ -616,7 +616,11 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
     }
 
     override fun getTitle(): String? {
-        return EmojiCompat.get().process(currentConversation!!.displayName).toString()
+        if (currentConversation != null) {
+            return EmojiCompat.get().process(currentConversation!!.displayName).toString()
+        } else {
+            return ""
+        }
     }
 
     public override fun onDestroy() {