Updating User model
Updating error handling