Index: DOM/DomeinContext.cls.xml
===================================================================
diff -u -r1852 -r2021
--- DOM/DomeinContext.cls.xml	(.../DomeinContext.cls.xml)	(revision 1852)
+++ DOM/DomeinContext.cls.xml	(.../DomeinContext.cls.xml)	(revision 2021)
@@ -94,7 +94,7 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>DOM.DomeinContext</ReturnType>
 <Implementation><![CDATA[
-	If $G(%DomeinContext) = "" {
+	If (($G(%DomeinContext) = "") || ('$IsObject(%DomeinContext))) {
 		Set %DomeinContext = ..%New()
 	}
 	Quit %DomeinContext
Index: TECH/Config/ConfigMgr.cls.xml
===================================================================
diff -u -r1888 -r2021
--- TECH/Config/ConfigMgr.cls.xml	(.../ConfigMgr.cls.xml)	(revision 1888)
+++ TECH/Config/ConfigMgr.cls.xml	(.../ConfigMgr.cls.xml)	(revision 2021)
@@ -33,7 +33,7 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.Config.ConfigMgr</ReturnType>
 <Implementation><![CDATA[
- 	If '$Data(%TechConfigConfigMgr) Set %TechConfigConfigMgr = ..%New()
+ 	If ('$Data(%TechConfigConfigMgr) || ('$IsObject(%TechConfigConfigMgr))) Set %TechConfigConfigMgr = ..%New()
     Quit %TechConfigConfigMgr
 ]]></Implementation>
 </Method>
Index: TECH/Context/RuntimeContext.cls.xml
===================================================================
diff -u -r1748 -r2021
--- TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 1748)
+++ TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 2021)
@@ -28,7 +28,7 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.Context.RuntimeContext</ReturnType>
 <Implementation><![CDATA[
-    If '$data(%TECHContextRuntimeContext) Set %TECHContextRuntimeContext = ..%New()
+    If ('$data(%TECHContextRuntimeContext) || ('$IsObject(%TECHContextRuntimeContext))) Set %TECHContextRuntimeContext = ..%New()
     Quit %TECHContextRuntimeContext
 ]]></Implementation>
 </Method>