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>