diff --git python/samba/remove_dc.py python/samba/remove_dc.py
index d1904610e91..9062ebb2d23 100644
--- python/samba/remove_dc.py
+++ python/samba/remove_dc.py
@@ -263,7 +263,10 @@ def offline_remove_server(samdb, logger,
         if remove_computer_obj:
             # Delete the computer tree
             logger.info("Removing computer account: %s (and any child objects)" % computer_dn)
-            samdb.delete(computer_dn, ["tree_delete:0"])
+            try:
+                samdb.delete(computer_dn, ["tree_delete:0"])
+            except:
+                pass
 
         if "dnsHostName" in msgs[0]:
             dnsHostName = msgs[0]["dnsHostName"][0]