diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/TSql/MockSqlCommand.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/TSql/MockSqlCommand.cs
index 77044bea8a77..72f37b9bcbd8 100644
--- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/TSql/MockSqlCommand.cs
+++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/TSql/MockSqlCommand.cs
@@ -467,22 +467,29 @@ private string GetCommandKey()
             {
                 string value;
 
-                switch (parameter.DbType)
+                if (parameter.Value == DBNull.Value)
                 {
-                    case DbType.AnsiString:
-                    case DbType.AnsiStringFixedLength:
-                        value = (string)parameter.Value;
-                        break;
-                    case DbType.String:
-                    case DbType.StringFixedLength:
-                        value = (string)parameter.Value;
-                        break;
-                    case DbType.Boolean:
-                        value = (bool)parameter.Value ? "1" : "0";
-                        break;
-                    default:
-                        value = parameter.Value.ToString();
-                        break;
+                    value = string.Empty;
+                }
+                else
+                {
+                    switch (parameter.DbType)
+                    {
+                        case DbType.AnsiString:
+                        case DbType.AnsiStringFixedLength:
+                            value = (string)parameter.Value;
+                            break;
+                        case DbType.String:
+                        case DbType.StringFixedLength:
+                            value = (string)parameter.Value;
+                            break;
+                        case DbType.Boolean:
+                            value = (bool)parameter.Value ? "1" : "0";
+                            break;
+                        default:
+                            value = parameter.Value.ToString();
+                            break;
+                    }
                 }
 
                 key = key.Replace(parameter.ParameterName, value);
diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/TSqlConnectionContext.cs b/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/TSqlConnectionContext.cs
index 51faaac957f8..73181b8572db 100644
--- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/TSqlConnectionContext.cs
+++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Services/Server/TSqlConnectionContext.cs
@@ -210,7 +210,7 @@ public Database[] GetDatabases()
                     command.CommandText = getDatabaseQuery;
                     DbParameter param = command.CreateParameter();
                     param.ParameterName = "@name";
-                    param.Value = null;
+                    param.Value = DBNull.Value;
 
                     command.Parameters.Add(param);