diff --git a/VAR.DatabaseExplorer/Code/DataAccess/DatabaseDA.cs b/VAR.DatabaseExplorer/Code/DataAccess/DatabaseDA.cs
index 3bbef03..fd7c49a 100644
--- a/VAR.DatabaseExplorer/Code/DataAccess/DatabaseDA.cs
+++ b/VAR.DatabaseExplorer/Code/DataAccess/DatabaseDA.cs
@@ -33,6 +33,7 @@ namespace VAR.DatabaseExplorer.Code.DataAccess
 
         public static Database GetInfo(string connectionString)
         {
+            string databaseName = null;
             var cnx = new SqlConnection(connectionString);
             string strCmd = string.Format(@"
                 SELECT
@@ -44,9 +45,19 @@ namespace VAR.DatabaseExplorer.Code.DataAccess
             var da = new SqlDataAdapter(strCmd, cnx);
             var dt = new DataTable();
             cnx.Open();
+            databaseName = cnx.Database;
             da.Fill(dt);
             cnx.Close();
 
+            if(dt.Rows.Count == 0)
+            {
+                return new Database
+                {
+                    Name = databaseName,
+                    CreateDate = DateTime.UtcNow,
+                };
+            }
+
             var database = new Database
             {
                 Name = Convert.ToString(dt.Rows[0]["DatabaseName"]),