Some small improvements, to be able to send messages if there is no payload + some more logging of a potential issue