Change NULL conditions construction