properly convert to/from nulls in messages

Signed-off-by: Jan Dvořák <mordae@anilinux.org>