Catch Throwable rather than Exception if latches are present.

src/main/java/org/elasticsearch/cluster/metadata/MetaDataDeleteIndexService.java

@@ -138,7 +138,7 @@ public class MetaDataDeleteIndexService extends AbstractComponent {
 
                 // wait for events from all nodes that it has been removed from their respective metadata...
                 int count = currentState.nodes().size();
-                // add the notifications that the store was deleted from *date* nodes
+                // add the notifications that the store was deleted from *data* nodes
                 count += currentState.nodes().dataNodes().size();
                 final AtomicInteger counter = new AtomicInteger(count);
                 final NodeIndexDeletedAction.Listener nodeIndexDeleteListener = new NodeIndexDeletedAction.Listener() {

src/main/java/org/elasticsearch/index/service/InternalIndexService.java

@@ -265,7 +265,7 @@ public class InternalIndexService extends AbstractIndexComponent implements Inde
                 public void run() {
                     try {
                         removeShard(shardId, reason);
-                    } catch (Exception e) {
+                    } catch (Throwable e) {
                         logger.warn("failed to close shard", e);
                     } finally {
                         latch.countDown();

src/main/java/org/elasticsearch/indices/InternalIndicesService.java

@@ -152,7 +152,7 @@ public class InternalIndicesService extends AbstractLifecycleComponent<IndicesSe
                 public void run() {
                     try {
                         removeIndex(index, "shutdown", shardsStopExecutor);
-                    } catch (Exception e) {
+                    } catch (Throwable e) {
                         logger.warn("failed to delete index on stop [" + index + "]", e);
                     } finally {
                         latch.countDown();