Merge "Fix the bug about nullpointer when update VIM"