fix null point bug

Change-Id: I395bac21536027118c376857a5af48a8da3184c3