2 files changed, 4 insertions, 4 deletions
diff --git a/src/HTML5/Parser/CharacterReference.php b/src/HTML5/Parser/CharacterReference.php
index cc71f8f..ea6a527 100644
--- a/src/HTML5/Parser/CharacterReference.php
+++ b/src/HTML5/Parser/CharacterReference.php
@@ -19,9 +19,8 @@ class CharacterReference {
    *   The character sequence. In UTF-8 this may be more than one byte.
    */
   public static function lookupName($name) {
-    $char = Entities::$byName[$name];
-
-    return $char;
+    // Do we really want to return NULL here? or FFFD
+    return isset(Entities::$byName[$name]) ? Entities::$byName[$name] : NULL;
   }
 
   /**
diff --git a/src/HTML5/Parser/Tokenizer.php b/src/HTML5/Parser/Tokenizer.php
index 2e74c5f..500588c 100644
--- a/src/HTML5/Parser/Tokenizer.php
+++ b/src/HTML5/Parser/Tokenizer.php
@@ -144,9 +144,10 @@ class Tokenizer {
       // X[0-9a-fA-F]+;
       // x[0-9a-fA-F]+;
       if ($tok == 'x' || $tok == 'X') {
+        $tok = $this->scanner->next(); // Consume x
         $hex = $this->scanner->getHex();
         if (empty($hex)) {
-          throw ParseError("Expected &#xHEX;, got &#x" . $tok);
+          throw new ParseError("Expected &#xHEX;, got &#x" . $tok);
         }
         $entity = CharacterReference::lookupHex($hex);
       }