diff --git a/lib/rb/lib/thrift/protocol/binaryprotocol.rb b/lib/rb/lib/thrift/protocol/binaryprotocol.rb
index b344faf..aa2c9d2 100644
--- a/lib/rb/lib/thrift/protocol/binaryprotocol.rb
+++ b/lib/rb/lib/thrift/protocol/binaryprotocol.rb
@@ -184,7 +184,7 @@
 
   class BinaryProtocolFactory < ProtocolFactory
     def get_protocol(trans)
-      return TBinaryProtocol.new(trans)
+      return Thrift::BinaryProtocol.new(trans)
     end
   end
   deprecate_class! :TBinaryProtocolFactory => BinaryProtocolFactory
diff --git a/lib/rb/lib/thrift/server.rb b/lib/rb/lib/thrift/server.rb
index d19a5b2..de10794 100644
--- a/lib/rb/lib/thrift/server.rb
+++ b/lib/rb/lib/thrift/server.rb
@@ -39,7 +39,7 @@
             while (true)
               @processor.process(prot, prot)
             end
-          rescue TTransportException, Thrift::ProtocolException => ttx
+          rescue Thrift::TransportException, Thrift::ProtocolException => ttx
             #print ttx,"\n"
           ensure
             trans.close()
@@ -73,7 +73,7 @@
               while (true)
                 @processor.process(p, p)
               end
-            rescue TTransportException, Thrift::ProtocolException => e
+            rescue Thrift::TransportException, Thrift::ProtocolException => e
             ensure
               t.close()
             end
@@ -120,7 +120,7 @@
                   while (true)
                     @processor.process(prot, prot)
                   end
-                rescue TTransportException, Thrift::ProtocolException => e
+                rescue Thrift::TransportException, Thrift::ProtocolException => e
                 ensure
                   trans.close()
                 end