Fixes ZEN-12762: NPE when closing/acking events