MIFOSX-800 - added empty data check