Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -N -r1.27 -r1.28
--- openacs-4/packages/xowiki/www/admin/import.tcl	9 May 2018 15:33:34 -0000	1.27
+++ openacs-4/packages/xowiki/www/admin/import.tcl	4 Jan 2019 15:50:36 -0000	1.28
@@ -70,12 +70,13 @@
         } on error {errMsg} {
           ns_log notice "Error during import: $errMsg\nErrInfo: $::errorInfo"
           ::xotcl::Object msg "Error during import: $errMsg\nErrInfo: $::errorInfo"
-          foreach o $objects {$o destroy}
           error $errMsg
-        }
-        foreach o $objects {
-          if {[::xotcl::Object isobject $o]} {
-            $o destroy
+        } finally {
+          # Make sure objects have been cleaned up
+          foreach o $objects {
+            if {[::xotcl::Object isobject $o]} {
+              $o destroy
+            }
           }
         }
       }