Added error safety and a unique message for duplicate emails

store/sql_user_store.go

@@ -161,7 +161,9 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha
 			}
 
 			if count, err := us.GetMaster().Update(user); err != nil {
-				if IsUniqueConstraintError(err.Error(), "Username", "users_username_teamid_key") {
+				if IsUniqueConstraintError(err.Error(), "Email", "users_email_teamid_key") {
+					result.Err = model.NewAppError("SqlUserStore.Update", "This email is already taken. Please choose another", "user_id="+user.Id+", "+err.Error())
+				} else if IsUniqueConstraintError(err.Error(), "Username", "users_username_teamid_key") {
 					result.Err = model.NewAppError("SqlUserStore.Update", "This username is already taken. Please choose another.", "user_id="+user.Id+", "+err.Error())
 				} else {
 					result.Err = model.NewAppError("SqlUserStore.Update", "We encounted an error updating the account", "user_id="+user.Id+", "+err.Error())

web/react/components/user_settings.jsx

@@ -709,7 +709,11 @@ var GeneralTab = React.createClass({
             }.bind(this),
             function(err) {
                 state = this.getInitialState();
-                state.server_error = err.message;
+                if(err.message) {
+                    state.server_error = err.message;
+                } else {
+                    state.server_error = err
+                }
                 this.setState(state);
             }.bind(this)
         );