diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml
index d6a9a49..c2b8a19 100644
--- a/resources/META-INF/plugin.xml
+++ b/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>lv.midiana.misc.idea-plugins.deep-js-completion</id>
   <name>deep-js-completion</name>
-  <version>2018.06.16.001</version>
+  <version>2018.09.14.001</version>
   <vendor email="safronevev@gmail.com"  url="http://midiana.lv/entry/deep-js-completion">Klesun</vendor>
 
   <description><![CDATA[
@@ -26,7 +26,7 @@ This plugin will be highly inspired by my other plugin, <a href="https://plugins
     ]]></description>
 
   <change-notes><![CDATA[
-  <li>First change note</li>
+  <li>Fix: null pointer on parameters.getOriginalPosition</li>
     ]]>
   </change-notes>
 
@@ -46,4 +46,4 @@ This plugin will be highly inspired by my other plugin, <a href="https://plugins
     <!-- Add your actions here -->
   </actions>
 
-</idea-plugin>
\ No newline at end of file
+</idea-plugin>
diff --git a/src/org/klesun/deep_js_completion/completion_providers/DeepKeysPvdr.scala b/src/org/klesun/deep_js_completion/completion_providers/DeepKeysPvdr.scala
index 5566c90..f946983 100644
--- a/src/org/klesun/deep_js_completion/completion_providers/DeepKeysPvdr.scala
+++ b/src/org/klesun/deep_js_completion/completion_providers/DeepKeysPvdr.scala
@@ -91,7 +91,8 @@ class DeepKeysPvdr extends CompletionProvider[CompletionParameters] {
     val depth = getMaxDepth(parameters.isAutoPopup)
     val search = new SearchCtx().setDepth(depth)
     val startTime = System.nanoTime
-    val suggestions = Option(parameters.getOriginalPosition.getParent)
+    val suggestions = Option(parameters.getOriginalPosition)
+      .flatMap(pos => Option(pos.getParent))
       .flatMap(findRefExpr(_))
       .flatMap(ref => Option(ref.getQualifier))
       .flatMap(qual => search.findExprType(qual))