fix null object marshalling