fix issues with reporting sender/xheader handling (null not supported)