diff --git a/srcs/juloo.keyboard2/ClipboardHistoryService.java b/srcs/juloo.keyboard2/ClipboardHistoryService.java
index e3f01ba..2c83ba6 100644
--- a/srcs/juloo.keyboard2/ClipboardHistoryService.java
+++ b/srcs/juloo.keyboard2/ClipboardHistoryService.java
@@ -145,7 +145,11 @@ public final class ClipboardHistoryService
       return;
     int count = clip.getItemCount();
     for (int i = 0; i < count; i++)
-      add_clip(clip.getItemAt(i).getText().toString());
+    {
+      CharSequence text = clip.getItemAt(i).getText();
+      if (text != null)
+        add_clip(text.toString());
+    }
   }
 
   final class SystemListener implements ClipboardManager.OnPrimaryClipChangedListener