* added few data check to prevent crash
[#73293212]