Return errors when unsupported headers are specified

Change-Id: Iec82253d3b0aacd0daa83b15d6d79b77d379f494
Merge "Return errors when unsupported headers are specified"