diff --git a/python/python-psi-api/src/com/jetbrains/python/psi/PyElementVisitor.java b/python/python-psi-api/src/com/jetbrains/python/psi/PyElementVisitor.java
index cc7444aa65e0..8e08bd26b225 100644
--- a/python/python-psi-api/src/com/jetbrains/python/psi/PyElementVisitor.java
+++ b/python/python-psi-api/src/com/jetbrains/python/psi/PyElementVisitor.java
@@ -203,11 +203,11 @@ public class PyElementVisitor extends PsiElementVisitor {
   }
 
   public void visitPyFunction(@NotNull PyFunction node) {
-    visitPyElement(node);
+    visitPyStatement(node);
   }
 
   public void visitPyClass(@NotNull PyClass node) {
-    visitPyElement(node);
+    visitPyStatement(node);
   }
 
   public void visitPyFile(@NotNull PyFile node) {
@@ -271,7 +271,7 @@ public class PyElementVisitor extends PsiElementVisitor {
   }
 
   public void visitPyAssertStatement(@NotNull PyAssertStatement node) {
-    visitPyElement(node);
+    visitPyStatement(node);
   }
 
   public void visitPyPassStatement(@NotNull PyPassStatement node) {
diff --git a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java
index f260c1079817..997f863adfc4 100644
--- a/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java
+++ b/python/python-psi-impl/src/com/jetbrains/python/codeInsight/controlflow/PyControlFlowBuilder.java
@@ -949,8 +949,10 @@ public class PyControlFlowBuilder extends PyRecursiveElementVisitor {
   @Override
   public void visitPyAssertStatement(final @NotNull PyAssertStatement node) {
     myBuilder.startNode(node);
-    super.visitPyAssertStatement(node);
     final PyExpression[] args = node.getArguments();
+    for (PyExpression arg : args) {
+      arg.accept(this);
+    }
     // assert False
     if (args.length >= 1) {
       if (!PyEvaluator.evaluateAsBooleanNoResolve(args[0], true)) {