Add more checking of headers.