Fixed NPE

so pro