Small tweak for non-existent headers and bodies