1 files changed, 3 insertions, 2 deletions
diff --git a/lib/models/plugin.js b/lib/models/plugin.js
index 6891d7d..ed7ad82 100644
--- a/lib/models/plugin.js
+++ b/lib/models/plugin.js
@@ -87,12 +87,13 @@ Plugin.prototype.getFilters = function() {
 */
 Plugin.prototype.getBlocks = function() {
     var blocks = this.getContent().get('blocks');
+    blocks = blocks || Immutable.Map();
 
     return blocks
         .map(function(block, blockName) {
-            block.name = blockName;
-            return new TemplateBlock(block);
+            return TemplateBlock.create(blockName, block);
         })
+        .valueSeq()
         .toList();
 };