Merge "Add null check before referencing mitigations array"