diff --git a/python/build/plugin-list.txt b/python/build/plugin-list.txt
index ba236d36d374..e17f2284361c 100644
--- a/python/build/plugin-list.txt
+++ b/python/build/plugin-list.txt
@@ -33,7 +33,9 @@ jdbc-console
 django-db-config
 database-impl
 DatabaseSupport
+database-plugin
 sql
+sql-plugin
 coffeescript
 remote-run
 python-remote-interpreter
diff --git a/python/main_pycharm.iml b/python/main_pycharm.iml
index e874a7c1a0af..361d43dbff5a 100644
--- a/python/main_pycharm.iml
+++ b/python/main_pycharm.iml
@@ -14,7 +14,8 @@
     <orderEntry type="module" module-name="hg4idea" />
     <orderEntry type="module" module-name="svn4idea" />
     <orderEntry type="module" module-name="git4idea" />
-    <orderEntry type="module" module-name="database-impl" />
+    <orderEntry type="module" module-name="database-plugin" />
+    <orderEntry type="module" module-name="sql-plugin" />
     <orderEntry type="module" module-name="jdbc-console" />
     <orderEntry type="module" module-name="django-db-config" />
     <orderEntry type="module" module-name="JSInspections" />
@@ -37,7 +38,6 @@
     <orderEntry type="module" module-name="pycharm-flask" />
     <orderEntry type="module" module-name="pycharm-numpy" />
     <orderEntry type="module" module-name="python-helpers" />
-    <orderEntry type="module" module-name="sql" />
     <orderEntry type="module" module-name="vagrant" />
   </component>
 </module>
diff --git a/python/src/com/jetbrains/python/psi/impl/stubs/PyFileStubBuilder.java b/python/src/com/jetbrains/python/psi/impl/stubs/PyFileStubBuilder.java
index 85170a677687..1f11466490ac 100644
--- a/python/src/com/jetbrains/python/psi/impl/stubs/PyFileStubBuilder.java
+++ b/python/src/com/jetbrains/python/psi/impl/stubs/PyFileStubBuilder.java
@@ -5,12 +5,10 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.stubs.DefaultStubBuilder;
 import com.intellij.psi.stubs.StubElement;
-import com.intellij.psi.tree.IElementType;
 import com.jetbrains.python.psi.PyFile;
 import com.jetbrains.python.psi.PyIfStatement;
 import com.jetbrains.python.psi.PyUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * @author yole
@@ -26,18 +24,13 @@ public class PyFileStubBuilder extends DefaultStubBuilder {
   }
 
   @Override
-  protected boolean skipChildProcessingWhenBuildingStubs(@NotNull PsiElement element, @NotNull PsiElement child) {
-    return element instanceof PyIfStatement && PyUtil.isIfNameEqualsMain((PyIfStatement)element);
+  protected boolean skipChildProcessingWhenBuildingStubs(@NotNull PsiElement parent, @NotNull PsiElement element) {
+    return parent instanceof PyIfStatement && PyUtil.isIfNameEqualsMain((PyIfStatement)parent);
   }
 
   @Override
-  public boolean skipChildProcessingWhenBuildingStubs(@Nullable ASTNode parent, IElementType childType) {
-    if (parent != null) {
-      final PsiElement psi = parent.getPsi();
-      if (psi != null) {
-        return psi instanceof PyIfStatement && PyUtil.isIfNameEqualsMain((PyIfStatement)psi);
-      }
-    }
-    return super.skipChildProcessingWhenBuildingStubs(parent, childType);
+  public boolean skipChildProcessingWhenBuildingStubs(@NotNull ASTNode parent, @NotNull ASTNode node) {
+    PsiElement psi = parent.getPsi();
+    return psi instanceof PyIfStatement && PyUtil.isIfNameEqualsMain((PyIfStatement)psi);
   }
 }