diff --git a/mythtv/programs/mythbackend/servicesv2/v2config.cpp b/mythtv/programs/mythbackend/servicesv2/v2config.cpp
index 2e70abcf9ce..df2212a0417 100644
--- a/mythtv/programs/mythbackend/servicesv2/v2config.cpp
+++ b/mythtv/programs/mythbackend/servicesv2/v2config.cpp
@@ -60,7 +60,7 @@ bool V2Config::SetDatabaseCredentials(const QString &Host, const QString &UserNa
         port = Port;
 
     if (DoTest && !TestDatabase(Host, UserName, Password, db, port))
-        throw( QString( "Database test failed. Not saving database connection information." ));
+        return false;
 
     DatabaseParams dbparms;
     dbparms.m_dbName = db;