diff --git a/jedi/api/helpers.py b/jedi/api/helpers.py
index 04ea09e5..2d0b41f6 100644
--- a/jedi/api/helpers.py
+++ b/jedi/api/helpers.py
@@ -54,6 +54,9 @@ def importer_from_error_statement(error_statement, pos):
     for typ, nodes in error_statement.stack:
         if typ == 'dotted_name':
             names += check_dotted(nodes)
+        elif typ == 'import_name':
+            if nodes[0].start_pos <= pos <= nodes[0].end_pos:
+                return None, 0, False
         elif typ == 'import_from':
             for node in nodes:
                 if isinstance(node, pt.Node) and node.type == 'dotted_name':
diff --git a/test/test_integration_keyword.py b/test/test_integration_keyword.py
index 25b7a01a..a67aa66f 100644
--- a/test/test_integration_keyword.py
+++ b/test/test_integration_keyword.py
@@ -3,7 +3,6 @@ Test of keywords and ``jedi.keywords``
 """
 import jedi
 from jedi import Script, common
-import pytest
 
 
 def test_goto_assignments_keyword():
@@ -20,11 +19,8 @@ def test_keyword():
     defs = Script("print").goto_definitions()
     assert [d.doc for d in defs]
 
-    with pytest.raises(jedi.NotFoundError):
-        Script("import").goto_assignments()
+    assert Script("import").goto_assignments() == []
 
     completions = Script("import", 1, 1).completions()
-    assert len(completions) == 0
-    with common.ignored(jedi.NotFoundError):  # TODO shouldn't throw that.
-        defs = Script("assert").goto_definitions()
-        assert len(defs) == 1
+    assert len(completions) > 10 and 'if' in [c.name for c in completions]
+    assert Script("assert").goto_definitions() == []