Fix NPE
fix npe