Index: branches/pyyaml3000/lib/yaml/parser.py
===================================================================
--- branches/pyyaml3000/lib/yaml/parser.py	(revision 46)
+++ branches/pyyaml3000/lib/yaml/parser.py	(revision 47)
@@ -96,7 +96,7 @@
     def parse_stream(self):
         documents = []
-        if not self.is_token(DirectiveToken, DocumentStartToken, EndToken):
+        if not self.is_token(DirectiveToken, DocumentStartToken, StreamEndToken):
             documents.append(self.parse_block_node())
-        while not self.is_token(EndToken):
+        while not self.is_token(StreamEndToken):
             while self.is_token(DirectiveToken):
                 self.get_token()
@@ -105,5 +105,5 @@
             self.get_token()
             if self.is_token(DirectiveToken,
-                    DocumentStartToken, DocumentEndToken, EndToken):
+                    DocumentStartToken, DocumentEndToken, StreamEndToken):
                 documents.append(None)
             else:
@@ -111,6 +111,6 @@
             while self.is_token(DocumentEndToken):
                 self.get_token()
-        if not self.is_token(EndToken):
-            self.fail("END is expected")
+        if not self.is_token(StreamEndToken):
+            self.fail("STREAM-END is expected")
         return documents
 
@@ -285,4 +285,4 @@
     def fail(self, message):
         marker = self.scanner.peek_token().start_marker
-        raise Error(message+':\n'+marker.get_snippet())
-
+        raise ParserError(message+':\n'+marker.get_snippet())
+