New state checks are added: null and condition checks