Fix crashes due to new drafts (type 4) not having existing headers