summaryrefslogtreecommitdiffstats
path: root/web/react/components
diff options
context:
space:
mode:
Diffstat (limited to 'web/react/components')
-rw-r--r--web/react/components/user_settings.jsx6
1 files changed, 5 insertions, 1 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx
index 47772a26b..e7ac08a94 100644
--- a/web/react/components/user_settings.jsx
+++ b/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)
);