Improve support for empty (null) body