diff --git a/lib/rb/lib/thrift/transport/socket.rb b/lib/rb/lib/thrift/transport/socket.rb
index 762b8d3..fdd0bc0 100644
--- a/lib/rb/lib/thrift/transport/socket.rb
+++ b/lib/rb/lib/thrift/transport/socket.rb
@@ -47,7 +47,7 @@
       begin
         data = @handle.recv(sz)
         if (data.length == 0)
-          raise TransportException.new("TSocket: Could not read #{sz} bytes from #{@host}:#{@port}")
+          raise TransportException.new("Socket: Could not read #{sz} bytes from #{@host}:#{@port}")
         end
         return data
       rescue StandardError
@@ -69,7 +69,7 @@
     end
 
     def listen()
-      @handle = TCPserver.new(nil, @port)
+      @handle = TCPServer.new(nil, @port)
     end
 
     def accept()