Add code to handle user.id not found