diff --git a/src/App/Document.cpp b/src/App/Document.cpp
index bd99723f0f..6c168dbec7 100644
--- a/src/App/Document.cpp
+++ b/src/App/Document.cpp
@@ -2826,18 +2826,24 @@ int Document::recompute(const std::vector<App::DocumentObject*> &objs, bool forc
     FC_TIME_LOG(t,"Recompute total");
 
     if (!d->_RecomputeLog.empty()) {
-        d->pendingRemove.clear();
         if (!testStatus(Status::IgnoreErrorOnRecompute))
             Base::Console().Error("Recompute failed!\n");
     }
-    else {
-        for(auto &o : d->pendingRemove) {
-            auto obj = o.getObject();
-            if (obj)
-                obj->getDocument()->removeObject(obj->getNameInDocument());
+
+    for (auto doc : GetApplication().getDocuments()) {
+        decltype(doc->d->pendingRemove) objs;
+        objs.swap(doc->d->pendingRemove);
+        for(auto &o : objs) {
+            try {
+                if (auto obj = o.getObject()) {
+                    obj->getDocument()->removeObject(obj->getNameInDocument());
+                }
+            } catch (Base::Exception & e) {
+                e.ReportException();
+                FC_ERR("error when removing object " << o.getDocumentName() << '#' << o.getObjectName());
+            }
         }
     }
-
     return objectCount;
 }
 
@@ -3369,7 +3375,7 @@ void Document::removeObject(const char* sName)
 
     if (pos->second->testStatus(ObjectStatus::PendingRecompute)) {
         // TODO: shall we allow removal if there is active undo transaction?
-        FC_LOG("pending remove of " << sName << " after recomputing document " << getName());
+        FC_MSG("pending remove of " << sName << " after recomputing document " << getName());
         d->pendingRemove.emplace_back(pos->second);
         return;
     }