CleanUp() call during restart() is now surrounded but try/catch, which allows the restart to continue if the cleanUp() method fails.

core/src/main/java/hudson/WebAppMain.java

@@ -393,8 +393,13 @@ public class WebAppMain implements ServletContextListener {
     public void contextDestroyed(ServletContextEvent event) {
         terminated = true;
         Jenkins instance = Jenkins.getInstance();
-        if(instance!=null)
-            instance.cleanUp();
+        try {
+            if (instance != null) {
+                instance.cleanUp();
+            }
+        } catch (Exception e) {
+            LOGGER.log(Level.SEVERE, "Failed to clean up. Restart will continue.", e);
+        }
         Thread t = initThread;
         if (t != null && t.isAlive()) {
             LOGGER.log(Level.INFO, "Shutting down a Jenkins instance that was still starting up", new Throwable("reason"));