Index: openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl,v
diff -u -N -r1.148.2.4 -r1.148.2.5
--- openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	10 Mar 2019 21:02:30 -0000	1.148.2.4
+++ openacs-4/packages/xotcl-core/tcl/05-db-procs.tcl	11 Mar 2019 13:49:48 -0000	1.148.2.5
@@ -2560,8 +2560,8 @@
     if {![info exists package_id] && [info exists :package_id]} {
       set package_id ${:package_id}
     }
-    if {![info exists context_id] && [info exists :context_id]} {
-      set context_id ${:context_id}
+    if {![info exists context_id]} {
+      set context_id [expr {[info exists :context_id] ? ${:context_id} : ""}]
     }
     [:info class] get_context package_id modifying_user modifying_ip
     ::xo::dc dml update_object {
@@ -2601,8 +2601,8 @@
     if {![info exists package_id] && [info exists :package_id]} {
       set package_id ${:package_id}
     }
-    if {![info exists context_id] && [info exists :context_id]} {
-      set context_id ${:context_id}
+    if {![info exists context_id]} {
+      set context_id [expr {[info exists :context_id] ? ${:context_id} : ""}]
     }
     [:info class] get_context package_id creation_user creation_ip
     ::xo::dc transaction {