IDEX-679 : Headers can be null so avoid NPE here

(which lead to Uncaught TypeError: Cannot read property 'typeMarker$' of null )