Fixing a Headers null check