[543599] Fix null navigation hazards
1 file changed