diff --git a/jedi/parsing.py b/jedi/parsing.py
index 2772f679..d402753e 100644
--- a/jedi/parsing.py
+++ b/jedi/parsing.py
@@ -659,7 +659,8 @@ class Parser(object):
                 continue
             elif tok == 'assert':
                 stmt, tok = self._parse_statement()
-                stmt.parent = use_as_parent_scope
+                if stmt is not None:
+                    stmt.parent = use_as_parent_scope
                 self._scope.asserts.append(stmt)
             # default
             elif token_type in [tokenize.NAME, tokenize.STRING,
diff --git a/test/test_regression.py b/test/test_regression.py
index 04369bf0..e72f0212 100755
--- a/test/test_regression.py
+++ b/test/test_regression.py
@@ -326,6 +326,9 @@ class TestRegression(TestBase):
         assert len(defs) == 0
         completions = self.completions("import", (1,1))
         assert len(completions) == 0
+        with common.ignored(jedi.NotFoundError):  # TODO shouldn't throw that.
+            defs = self.goto_definitions("assert")
+            assert len(defs) == 1
 
     def test_goto_following_on_imports(self):
         s = "import multiprocessing.dummy; multiprocessing.dummy"