EMBPD00154917-fix crash issue

EMBPD00154917-fix crash issue