diff --git a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt
index 83707f92c..a9b8ab7f2 100644
--- a/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/timeout/ClipboardHelper.kt
@@ -98,10 +98,14 @@ class ClipboardHelper(private val context: Context) {
 
     @Throws(ClipboardException::class)
     fun cleanClipboard(label: String = "") {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            getClipboardManager()?.clearPrimaryClip()
-        } else {
-            copyToClipboard(label, "")
+        try {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+                getClipboardManager()?.clearPrimaryClip()
+            } else {
+                copyToClipboard(label, "")
+            }
+        } catch (e: Exception) {
+            throw ClipboardException(e)
         }
     }