Imported Upstream version 1.6.5

1 files changed, 2 insertions, 2 deletions

diff --git a/s/grid.cpp b/s/grid.cpp
index e4991b2..443cd9a 100644
--- a/s/grid.cpp
+++ b/s/grid.cpp
@@ -242,8 +242,8 @@ namespace mongo {
             DBConfigPtr config = getDBConfig( *it , false );
             if ( config.get() != NULL ){
                 ostringstream ss;
-                ss << "trying to add shard " << servers.toString() << " because local database " << *it;
-                ss << " exists in another " << config->getPrimary().toString();
+                ss << "can't add shard " << servers.toString() << " because a local database '" << *it;
+                ss << "' exists in another " << config->getPrimary().toString();
                 errMsg = ss.str();
                 return false;
             }