Better checks for headers, fail if not present