fix more NULL-related issues