diff --git a/CHANGELOG.md b/CHANGELOG.md
index 059334c..598e7c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 # easy-i18n Changelog
 
 ## [Unreleased]
+### Fixed
+- NullPointerException on key completion
+
+## [1.6.0]
 ### Added
 - The search function now supports full-text-search
 - Automatically reload translation data on file system change
diff --git a/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java b/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java
index d76b936..39e6a27 100644
--- a/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java
+++ b/src/main/java/de/marhali/easyi18n/editor/KeyCompletionProvider.java
@@ -38,10 +38,6 @@ public class KeyCompletionProvider extends CompletionProvider<CompletionParamete
 
         String path = result.getPrefixMatcher().getPrefix();
 
-        if(pathPrefix == null) {
-            pathPrefix = "";
-        }
-
         if(path.startsWith(pathPrefix)) {
             path = path.substring(pathPrefix.length());
 
@@ -77,12 +73,15 @@ public class KeyCompletionProvider extends CompletionProvider<CompletionParamete
 
                 } else {
                     Translation translation = store.getData().getTranslation(key);
-                    String content = translation.get(previewLocale);
 
-                    result.addElement(LookupElementBuilder.create(pathPrefix + key)
-                            .withIcon(AllIcons.Actions.PreserveCaseHover)
-                            .appendTailText(" I18n(" + previewLocale + ": " + content + ")", true)
-                    );
+                    if(translation != null) {
+                        String content = translation.get(previewLocale);
+
+                        result.addElement(LookupElementBuilder.create(pathPrefix + key)
+                                .withIcon(AllIcons.Actions.PreserveCaseHover)
+                                .appendTailText(" I18n(" + previewLocale + ": " + content + ")", true)
+                        );
+                    }
                 }
             }
         }