Improved error messages of headers research code.