Cleanup, differentiate between non-Hawk header and actual problem.