Update to checking duplicate message in handler.