fix #916 npe haschanges

fix #916 npe haschanges