Fix bug
Fix error handle