Merge branch 'master' of github.com:mongodb/mongo

2 files changed, 5 insertions, 2 deletions

diff --git a/client/dbclient.cpp b/client/dbclient.cpp
index 187a5d8a3b8..04b6147f162 100644
--- a/client/dbclient.cpp
+++ b/client/dbclient.cpp
@@ -48,7 +48,8 @@ namespace mongo {
             DBClientReplicaSet * set = new DBClientReplicaSet( _setName , _servers );
             if( ! set->connect() ){
                 delete set;
-                errmsg = "connect failed to set";
+                errmsg = "connect failed to set ";
+                errmsg += toString();
                 return 0;
             }
             return set;
diff --git a/client/dbclient.h b/client/dbclient.h
index 5da4f84af22..639d960982f 100644
--- a/client/dbclient.h
+++ b/client/dbclient.h
@@ -122,7 +122,7 @@ namespace mongo {
                 break;
             case SET:
                 assert( _setName.size() );
-                assert( _servers.size() > 1 );
+                assert( _servers.size() >= 1 ); // 1 is ok since we can derive
                 break;
             case PAIR:
                 assert( _servers.size() == 2 );
@@ -173,6 +173,8 @@ namespace mongo {
         
         void _finishInit(){
             stringstream ss;
+            if ( _type == SET )
+                ss << _setName << "/";
             for ( unsigned i=0; i<_servers.size(); i++ ){
                 if ( i > 0 )
                     ss << ",";