fix NPE
Fix grammar