Additional headers merge code was throughing NPE (causing a bunch of test failures)