diff --git a/CHANGELOG b/CHANGELOG
index b42a26cf7..32ce8d9f4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,6 @@
 * 1.41.1 (2019-XX-XX)
 
- * n/a
+ * fixed wrong error message on "import" and "from"
 
 * 1.41.0 (2019-05-14)
 
diff --git a/src/TokenParser/FromTokenParser.php b/src/TokenParser/FromTokenParser.php
index a47f197e8..af21f3fb8 100644
--- a/src/TokenParser/FromTokenParser.php
+++ b/src/TokenParser/FromTokenParser.php
@@ -29,7 +29,7 @@ class FromTokenParser extends AbstractTokenParser
     {
         $macro = $this->parser->getExpressionParser()->parseExpression();
         $stream = $this->parser->getStream();
-        $stream->expect('import');
+        $stream->expect(Token::NAME_TYPE, 'import');
 
         $targets = [];
         do {
diff --git a/src/TokenParser/ImportTokenParser.php b/src/TokenParser/ImportTokenParser.php
index 317e0a5ea..88395b924 100644
--- a/src/TokenParser/ImportTokenParser.php
+++ b/src/TokenParser/ImportTokenParser.php
@@ -27,7 +27,7 @@ class ImportTokenParser extends AbstractTokenParser
     public function parse(Token $token)
     {
         $macro = $this->parser->getExpressionParser()->parseExpression();
-        $this->parser->getStream()->expect('as');
+        $this->parser->getStream()->expect(Token::NAME_TYPE, 'as');
         $var = new AssignNameExpression($this->parser->getStream()->expect(Token::NAME_TYPE)->getValue(), $token->getLine());
         $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);