Clearer shutdown message and handle evilness

1 files changed, 5 insertions, 1 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
index b2784dfef60..b103e485832 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
@@ -83,7 +83,11 @@ public class Deconstructor implements ComponentDeconstructor {
                 catch (InterruptedException exception) {
                     log.log(WARNING, "Randomized wait before dying disrupted. Dying now.");
                 }
-                com.yahoo.protect.Process.logAndDie("Error when deconstructing " + component, e);
+                com.yahoo.protect.Process.logAndDie("Shutting down due to error when deconstructing " +
+                                                    component, e);
+            }
+            catch (Throwable e) {
+                log.log(WARNING, "Non-error not exception throwable thrown when deconstructing " + component, e);
             }
         }
     }