diff --git a/lib/rdoc/token_stream.rb b/lib/rdoc/token_stream.rb
index 8fc6eadd85..adeef5b660 100644
--- a/lib/rdoc/token_stream.rb
+++ b/lib/rdoc/token_stream.rb
@@ -105,14 +105,14 @@ def pop_token
   # Current token stream
 
   def token_stream
-    @token_stream
+    @token_stream || []
   end
 
   ##
   # Returns a string representation of the token stream
 
   def tokens_to_s
-    token_stream.compact.map { |token| token[:text] }.join ''
+    token_stream.compact.map { |token| token[:text] }.join
   end
 
 end
diff --git a/test/rdoc/test_rdoc_token_stream.rb b/test/rdoc/test_rdoc_token_stream.rb
index 29c5047fb5..dafbe22323 100644
--- a/test/rdoc/test_rdoc_token_stream.rb
+++ b/test/rdoc/test_rdoc_token_stream.rb
@@ -53,5 +53,14 @@ def initialize
     end.new
 
     assert_equal "foo 'bar'", foo.tokens_to_s
+
+    foo = Class.new do
+      include RDoc::TokenStream
+
+      def initialize
+        @token_stream = nil
+      end
+    end.new
+    assert_equal "", foo.tokens_to_s
   end
 end