Corrected NPE when closing Conflict Dialog.