diff --git a/jedi/parser/__init__.py b/jedi/parser/__init__.py
index 87d33f0d..290225f1 100644
--- a/jedi/parser/__init__.py
+++ b/jedi/parser/__init__.py
@@ -120,7 +120,7 @@ class Parser(object):
         tok = next(self._gen) if pre_used_token is None else pre_used_token
 
         if tok.type != tokenize.NAME and tok.string != '*':
-            return None, tok
+            return [], tok
 
         append(tok)
         while True:
@@ -493,9 +493,9 @@ class Parser(object):
                     defunct = True
                     if tok_str != 'import':
                         self._gen.push_last_back()
-                names = self._parse_import_list()
-                for count, (names, alias, defunct2) in enumerate(names):
-                    star = names and unicode(names) == '*'
+                imports = self._parse_import_list()
+                for count, (names, alias, defunct2) in enumerate(imports):
+                    star = names and unicode(names[-1]) == '*'
                     if star:
                         names = []
                     e = (alias or names and names[-1] or self._gen.previous).end_pos
diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py
index 7eedaf17..bf7b93da 100644
--- a/jedi/parser/representation.py
+++ b/jedi/parser/representation.py
@@ -494,7 +494,7 @@ class SubModule(Scope, Module):
         is a ``__future__`` import.
         """
         for imp in self.imports:
-            if imp.from_names is None or imp.namespace_names is None:
+            if not imp.from_names or not imp.namespace_names:
                 continue
 
             namespace, feature = imp.from_names[0], imp.namespace_names[0]