Fixed null conformance