Fixing some nil comparaisons errors.