diff --git a/js/activity.js b/js/activity.js
index 980b641d61..a21879bfe4 100644
--- a/js/activity.js
+++ b/js/activity.js
@@ -296,14 +296,6 @@ define(function (require) {
                             y += 100 * turlteBlocksScale;
                         }
                     }
-                    /*
-                    // Collapse collapsible stacks.
-                    if (['start', 'action', 'drum', 'matrix'].indexOf(myBlock.name) !== -1 && !myBlock.trash) {
-                        if (!myBlock.collapsed) {
-                            myBlock.collapseToggle();
-                        }
-                    }
-                    */
                 }
             }
 
diff --git a/js/palette.js b/js/palette.js
index b9f651caa7..e8727fa7b9 100644
--- a/js/palette.js
+++ b/js/palette.js
@@ -641,7 +641,7 @@ function PaletteModel(palette, palettes, name) {
                 }
             }
 
-            if (['do', 'nameddo', 'namedbox', 'namedcalc', 'doArg', 'calcArg', 'nameddoArg', 'namedcalcArg'].indexOf(protoBlock.name) != -1 && label.length > 8) {
+            if (['do', 'nameddo', 'namedbox', 'namedcalc', 'doArg', 'calcArg', 'nameddoArg', 'namedcalcArg'].indexOf(protoBlock.name) != -1 && label != null && label.length > 8) {
                 label = label.substr(0, 7) + '...';
             }