refactor handler
refactor error handler