Merge pull request #1129 from rschamp/bugfix/1124

Allow empty response, again
scratchfoundation · Dec 19, 2016 · cfc962a · cfc962a
2 parents 9c8a7d5 + c901675
commit cfc962a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/views/studentregistration/studentregistration.jsx b/src/views/studentregistration/studentregistration.jsx
@@ -84,7 +84,7 @@ var StudentRegistration = intl.injectIntl(React.createClass({
             if (body[0] && body[0].success) return this.advanceStep(formData);
             this.setState({
                 registrationError:
-                    body[0].msg ||
+                    (body[0] && body[0].msg) ||
                     this.props.intl.formatMessage({id: 'registration.generalError'}) + ' (' + res.statusCode + ')'
             });
         }.bind(this));

diff --git a/src/views/teacherregistration/teacherregistration.jsx b/src/views/teacherregistration/teacherregistration.jsx
@@ -75,7 +75,7 @@ var TeacherRegistration = React.createClass({
             }
             this.setState({
                 registrationError:
-                    body[0].msg ||
+                    (body[0] && body[0].msg) ||
                     this.props.intl.formatMessage({id: 'registration.generalError'}) + ' (' + res.statusCode + ')'
             });
         }.bind(this));