Update handle return error type
Merge branch 'master' into develop