Fix process don't exit when error occurs
Merge branch 'master' into develop