From 7cdd91687c0e163dd867a11fb56fd7fbac9879d2 Mon Sep 17 00:00:00 2001
From: nickago <ngonella@calpoly.edu>
Date: Wed, 29 Jul 2015 10:45:33 -0700
Subject: Added error safety and a unique message for duplicate emails

---
 web/react/components/user_settings.jsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'web/react/components')

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)
         );
-- 
cgit v1.2.3-1-g7c22