don't throw exception when body comes back as null, fix var scope issues