fix more null errors