Don't output the body if empty.
  validation/error-handling improvements.