fix more NPE