Null conformance improved #SCL-5246 Fixed