mshah/rpearce: Ensure value is empty string when no value for header