Returning null/undefined values intact