diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
index 9b4f009ee1..20129d4ecd 100644
--- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
+++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt
@@ -51,6 +51,7 @@ import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @AutoInjector(NextcloudTalkApplication::class)
+@SuppressLint("TooGenericExceptionCaught")
 class ConversationsListBottomDialog(
     val activity: ConversationsListActivity,
     val currentUser: User,
diff --git a/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.kt b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.kt
index 2a239e869c..239c93f085 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/preferences/preferencestorage/DatabaseStorageModule.kt
@@ -8,6 +8,7 @@
  */
 package com.nextcloud.talk.utils.preferences.preferencestorage
 
+import android.annotation.SuppressLint
 import android.text.TextUtils
 import android.util.Log
 import autodagger.AutoInjector
@@ -32,6 +33,7 @@ import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 @AutoInjector(NextcloudTalkApplication::class)
+@SuppressLint("TooGenericExceptionCaught")
 class DatabaseStorageModule(conversationUser: User, conversationToken: String) {
 
     @JvmField
@@ -73,7 +75,7 @@ class DatabaseStorageModule(conversationUser: User, conversationToken: String) {
                 try {
                     ncApiCoroutines!!.notificationCalls(credentials!!, url, notificationLevel)
                     Log.d(TAG, "Toggled notification calls")
-                } catch (e: Throwable) {
+                } catch (e: Exception) {
                     Log.e(TAG, "Error when trying to toggle notification calls", e)
                 }
             }
@@ -94,7 +96,7 @@ class DatabaseStorageModule(conversationUser: User, conversationToken: String) {
         when (key) {
             "conversation_settings_dropdown" -> {
                 try {
-                    val apiVersion = getConversationApiVersion(conversationUser, intArrayOf(4))
+                    val apiVersion = getConversationApiVersion(conversationUser, intArrayOf(API_VERSION_4))
                     val trimmedValue = value.replace("expire_", "")
                     val valueInt = trimmedValue.toInt()
                     withContext(Dispatchers.IO) {
@@ -202,5 +204,6 @@ class DatabaseStorageModule(conversationUser: User, conversationToken: String) {
         private const val NOTIFICATION_NEVER = 3
         private const val NOTIFICATION_MENTION = 2
         private const val NOTIFICATION_ALWAYS = 1
+        private const val API_VERSION_4 = 4
     }
 }