diff --git a/lib/mongo/networking.rb b/lib/mongo/networking.rb
index eed51f8..001e7a4 100644
--- a/lib/mongo/networking.rb
+++ b/lib/mongo/networking.rb
@@ -87,9 +87,13 @@ module Mongo
       end
 
       if num_received == 1 && (error = docs[0]['err'] || docs[0]['errmsg'])
-        close if error == "not master"
-        error = "wtimeout" if error == "timeout"
-        raise OperationFailure.new(docs[0]['code'].to_s + ': ' + error, docs[0]['code'], docs[0])
+        if error.include?("not master")
+          close
+          raise ConnectionFailure.new(docs[0]['code'].to_s + ': ' + error, docs[0]['code'], docs[0])
+        else
+          error = "wtimeout" if error == "timeout"
+          raise OperationFailure.new(docs[0]['code'].to_s + ': ' + error, docs[0]['code'], docs[0])
+        end
       end
 
       docs[0]
diff --git a/test/replica_sets/connect_test.rb b/test/replica_sets/connect_test.rb
index 8c17204..f0f6e2a 100644
--- a/test/replica_sets/connect_test.rb
+++ b/test/replica_sets/connect_test.rb
@@ -80,6 +80,23 @@ class ConnectTest < Test::Unit::TestCase
     end
   end
 
+  def test_save_with_primary_stepped_down
+    @conn = ReplSetConnection.new([self.rs.host, self.rs.ports[0]], [self.rs.host, self.rs.ports[1]],
+      [self.rs.host, self.rs.ports[2]])
+
+    primary = Mongo::Connection.new(@conn.primary_pool.host, @conn.primary_pool.port)
+
+    # Adding force=true to avoid 'no secondaries within 10 seconds of my optime' errors
+    step_down_command = BSON::OrderedHash.new
+    step_down_command[:replSetStepDown] = 60
+    step_down_command[:force]           = true
+    primary['admin'].command(step_down_command)
+
+    rescue_connection_failure do
+      @conn[MONGO_TEST_DB]['bar'].save({:a => 1}, {:safe => {:w => 3}})
+    end
+  end
+
   def test_connect_with_connection_string
     @conn = Connection.from_uri("mongodb://#{self.rs.host}:#{self.rs.ports[0]},#{self.rs.host}:#{self.rs.ports[1]}?replicaset=#{self.rs.name}")
     assert @conn.is_a?(ReplSetConnection)