Add user error handling