diff --git a/src/js/react_views/LevelToolbarView.jsx b/src/js/react_views/LevelToolbarView.jsx
index 1248ae3e..7c12b1dd 100644
--- a/src/js/react_views/LevelToolbarView.jsx
+++ b/src/js/react_views/LevelToolbarView.jsx
@@ -16,15 +16,19 @@ var LevelToolbarView = React.createClass({
   getInitialState: function() {
     return {
       isHidden: true,
-      isGoalExpanded: false
+      isGoalExpanded: this.props.parent.getIsGoalExpanded()
     };
   },
 
   componentDidMount: function() {
     this.setState({
-      isHidden: false
+      isHidden: this.props.parent.getIsGoalExpanded()
     });
     this.props.parent.on('goalToggled', function() {
+      if (!this.isMounted()) {
+        return;
+      }
+
       this.setState({
         isGoalExpanded: this.props.parent.getIsGoalExpanded()
       });
@@ -57,8 +61,8 @@ var LevelToolbarView = React.createClass({
               onClick={this.props.onGoalClick}
               type="button">
               {this.state.isGoalExpanded ? 
-                intl.str('show-goal-button') :
-                intl.str('hide-goal-button')
+                intl.str('hide-goal-button') :
+                intl.str('show-goal-button')
               }
             </button>
           </div>
diff --git a/src/js/util/errors.js b/src/js/util/errors.js
index 53d362d2..041f7b30 100644
--- a/src/js/util/errors.js
+++ b/src/js/util/errors.js
@@ -10,6 +10,7 @@ var MyError = Backbone.Model.extend({
 
   getMsg: function() {
     if (!this.get('msg')) {
+      debugger;
       console.warn('mye rror without message');
     }
     return this.get('msg');