error check for update_check
Merge origin/master