fix some npe