OPAL-1618: NPE when removing a table when ES is stopped fixed