update
fix more null errors