Only send header when there is a value, refs #352