Issue 8: Don't output "null" when there's no body

Fixes issue 8