diff --git a/jedi/parser/__init__.py b/jedi/parser/__init__.py
index 0fb7af75..101e315c 100644
--- a/jedi/parser/__init__.py
+++ b/jedi/parser/__init__.py
@@ -484,8 +484,8 @@ class Parser(object):
                 if len(from_names) == 1 and str(from_names[0]) == 'import' and relative_count:
                     self._gen.push_last_back()
                     tok_str = 'import'
-                    names = []
-                if not names and not relative_count or tok_str != "import":
+                    from_names = []
+                if not from_names and not relative_count or tok_str != "import":
                     debug.warning("from: syntax error@%s", tok.start_pos[0])
                     defunct = True
                     if tok_str != 'import':
diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py
index 598c8893..fe2e2cac 100644
--- a/jedi/parser/representation.py
+++ b/jedi/parser/representation.py
@@ -477,7 +477,7 @@ class SubModule(Scope, Module):
         is a ``__future__`` import.
         """
         for imp in self.imports:
-            if imp.from_ns is None or imp.namespace_names is None:
+            if imp.from_names is None or imp.namespace_names is None:
                 continue
 
             namespace, feature = imp.from_names[0], imp.namespace_names[0]
@@ -822,9 +822,9 @@ class Import(Simple):
         if self.alias:
             return [self.alias]
         if len(self.namespace_names) > 1:
-            return self.namespace_names[0]
+            return [self.namespace_names[0]]
         else:
-            return [self.namespace_names]
+            return self.namespace_names
 
     def get_all_import_names(self):
         n = []