Fixed NPE
Fixed NPE