Minor correction to ensure the handlers can actually handle messages.