diff --git a/src/main/java/org/ballerinalang/plugins/idea/completion/BallerinaCompletionContributor.java b/src/main/java/org/ballerinalang/plugins/idea/completion/BallerinaCompletionContributor.java
index 9ceefb86..7672a30c 100644
--- a/src/main/java/org/ballerinalang/plugins/idea/completion/BallerinaCompletionContributor.java
+++ b/src/main/java/org/ballerinalang/plugins/idea/completion/BallerinaCompletionContributor.java
@@ -29,6 +29,7 @@
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.patterns.PlatformPatterns;
+import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiErrorElement;
@@ -668,7 +669,7 @@ private void addSuggestions(CompletionParameters parameters, CompletionResultSet
             // Todo - Handle scenario
         } else {
             // If we are currently at an identifier node, no need to suggest.
-            if (element instanceof IdentifierPSINode) {
+            if (element instanceof IdentifierPSINode || element instanceof PsiComment) {
                 return;
             }
             if (parentPrevSibling == null) {
diff --git a/src/main/java/org/ballerinalang/plugins/idea/psi/impl/BallerinaPsiImplUtil.java b/src/main/java/org/ballerinalang/plugins/idea/psi/impl/BallerinaPsiImplUtil.java
index 8cd5ed6c..9c2f416c 100644
--- a/src/main/java/org/ballerinalang/plugins/idea/psi/impl/BallerinaPsiImplUtil.java
+++ b/src/main/java/org/ballerinalang/plugins/idea/psi/impl/BallerinaPsiImplUtil.java
@@ -665,6 +665,9 @@ public static ArrayList<PsiElement> getAllImportedPackagesInCurrentFile(PsiEleme
      * @return all functions in the given directory(package)
      */
     public static List<PsiElement> getAllMatchingElementsFromPackage(PsiDirectory directory, String xpath) {
+        if (directory == null) {
+            return new LinkedList<>();
+        }
         Project project = directory.getProject();
         List<PsiElement> results = new ArrayList<>();
         VirtualFile virtualFile = directory.getVirtualFile();