Update handle return error type