Improve null handling when adding custom header
Merge pull request #972 from boillodmanuel/issue971-improve-null-handling

Improve null handling when adding custom header