diff --git a/core/pom.xml b/core/pom.xml
index 361fc2a1626770edab0e18629d179cd696ea8d7e..61d1b8698f2f4002374d117b54fbddab64b86248 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -194,7 +194,7 @@ THE SOFTWARE.
     <dependency>
       <groupId>org.jenkins-ci</groupId>
       <artifactId>annotation-indexer</artifactId>
-      <version>1.4</version>
+      <version>1.5</version>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci</groupId>
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index a54364e9849cc019def5017d55f0c4d56b3dc0e9..d56a6f33ea829e62ce73d160bdd43bec2e067d4d 100755
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -3326,10 +3326,8 @@ public class Jenkins extends AbstractCIBase implements ModifiableTopLevelItemGro
                     } else {
                         LOGGER.info("Safe-restart mode cancelled");
                     }
-                } catch (InterruptedException e) {
-                    LOGGER.log(Level.WARNING, "Failed to restart Hudson",e);
-                } catch (IOException e) {
-                    LOGGER.log(Level.WARNING, "Failed to restart Hudson",e);
+                } catch (Throwable e) {
+                    LOGGER.log(Level.WARNING, "Failed to restart Jenkins",e);
                 }
             }
         }.start();