Added support for null message bodies