Automatic merge from submit-queue (batch tested with PRs 40132, 39302, 40194, 40619, 40601) fix nil check and typos **What this PR does / why we need it**: 1. nil error should be checked before defer statement. 2. fix some typos. Signed-off-by: bruceauyeung ouyang.qinhua@zte.com.cn