diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
index be72ddbb5..56146cacd 100644
--- a/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
+++ b/TestBenchFramework/BenchControl/DB/SensusOracle/Database.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015 Sensus Metering Systems
+/// Copyright (c) 2015-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -69,24 +69,39 @@ namespace TBF.BenchControl.DB.SensusOracle
 
         public void Initialize()
         {
-            connection = (DBCfg.DBUsed == DBUsed.Production)
-                ? new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;")
-                : new OracleConnection("Data Source=STARA_TEST.WORLD;User Id=deltachef;Password=deltachef;");
+            switch (DBCfg.DBUsed)
+            {
+                case DBUsed.Production:
+                    connection = new OracleConnection("Data Source=STARA01.WORLD;User Id=deltachef;Password=deltachef;");
+                    break;
+                case DBUsed.Quality:
+                    connection = new OracleConnection("Data Source=STARA_TEST.WORLD;User Id=deltachef;Password=deltachef;");    /// TODO: Quality database specification
+                    break;
+                case DBUsed.Test:
+                    connection = new OracleConnection("Data Source=STARA_TEST.WORLD;User Id=deltachef;Password=deltachef;");
+                    break;
+                default:
+                    connection = null;
+                    break;
+            }
 
 			if (DBCfg.DebugLevel == DebugMode.Simulate) return;
 
             ///
             /// Do something with the database to see if the connection works well
             ///
-            connection.Open();
+            if (connection != null)
+            {
+                connection.Open();
 
-            string rslt = "none";
-            OracleCommand cmd = new OracleCommand("select Standort from ANBIETER_SD where ANBID = 4", connection);
-            OracleDataReader dr = cmd.ExecuteReader();
-            if (dr.Read()) rslt =  dr.GetString(0);
-            dr.Close();
+                string rslt = "none";
+                OracleCommand cmd = new OracleCommand("select Standort from ANBIETER_SD where ANBID = 4", connection);
+                OracleDataReader dr = cmd.ExecuteReader();
+                if (dr.Read()) rslt = dr.GetString(0);
+                dr.Close();
 
-            connection.Close();
+                connection.Close();
+            }
         }
 
         public void RunDeviceBefore() {}
@@ -215,7 +230,7 @@ namespace TBF.BenchControl.DB.SensusOracle
 
 			bool anyError = false;
 #if ORACLE_DB
-			if (DBCfg.DebugLevel != DebugMode.Simulate)
+			if (DBCfg.DebugLevel != DebugMode.Simulate && connection != null)
 			{
 				if (WriteResultsToDatabase(connection, batch, false) == Retv.Error) anyError = true;
 			}
diff --git a/TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfg.cs b/TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfg.cs
index 3ab7d4bfe..1169c573b 100644
--- a/TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfg.cs
+++ b/TestBenchFramework/BenchControl/DB/SensusOracle/DatabaseCfg.cs
@@ -1,5 +1,5 @@
 ///
-/// Copyright (c) 2015-2016 Sensus Metering Systems
+/// Copyright (c) 2015-2017 Sensus Metering Systems
 ///
 using System;
 using System.Collections.Generic;
@@ -11,6 +11,7 @@ namespace TBF.BenchControl.DB.SensusOracle
 {
 	public enum DBUsed
 	{
+        None,
 		Production,
 		Test,
 		Quality,
diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs
index 7f98d85e2..c565182f7 100644
--- a/TestBenchFramework/Properties/AssemblyInfo.cs
+++ b/TestBenchFramework/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.12.496.1")]
-[assembly: AssemblyFileVersion("2.12.496.1")]
+[assembly: AssemblyVersion("2.12.497.1")]
+[assembly: AssemblyFileVersion("2.12.497.1")]