Added check in NavData