Fix NPE

Change-Id: I1ea39257859d0418d73da4f71212ae47befcc5cc