[MONDRIAN-1471]  Moved shutdown of the ExecutorService into a finally block.