Bug 854292  - Add more safegaurds for headers being deleted while they ha...

...ve pending operations