Do not set headers with None value

- Regardless of whether they are on the session or not
- Fixes #1920