4 files changed, 31 insertions, 20 deletions
diff --git a/lib/handlebars/compiler/ast.js b/lib/handlebars/compiler/ast.js
index e05ceec..05de762 100644
--- a/lib/handlebars/compiler/ast.js
+++ b/lib/handlebars/compiler/ast.js
@@ -79,11 +79,11 @@ var AST = {
     this.strip.inlineStandalone = true;
   },
 
-  BlockNode: function(mustache, program, inverse, strip, locInfo) {
+  BlockNode: function(sexpr, program, inverse, strip, locInfo) {
     LocationInfo.call(this, locInfo);
 
     this.type = 'block';
-    this.mustache = mustache;
+    this.sexpr = sexpr;
     this.program  = program;
     this.inverse  = inverse;
     this.strip = strip;
@@ -93,17 +93,11 @@ var AST = {
     }
   },
 
-  RawBlockNode: function(mustache, content, close, locInfo) {
+  RawBlockNode: function(sexpr, content, locInfo) {
     LocationInfo.call(this, locInfo);
 
-    if (mustache.sexpr.id.original !== close) {
-      throw new Exception(mustache.sexpr.id.original + " doesn't match " + close, this);
-    }
-
-    content = new AST.ContentNode(content, locInfo);
-
     this.type = 'block';
-    this.mustache = mustache;
+    this.sexpr = sexpr;
     this.program = new AST.ProgramNode([content], {}, locInfo);
   },
 
diff --git a/lib/handlebars/compiler/compiler.js b/lib/handlebars/compiler/compiler.js
index 1303d8f..51e6620 100644
--- a/lib/handlebars/compiler/compiler.js
+++ b/lib/handlebars/compiler/compiler.js
@@ -108,7 +108,7 @@ Compiler.prototype = {
   },
 
   block: function(block) {
-    var mustache = block.mustache,
+    var sexpr = block.sexpr,
         program = block.program,
         inverse = block.inverse;
 
@@ -120,7 +120,6 @@ Compiler.prototype = {
       inverse = this.compileProgram(inverse);
     }
 
-    var sexpr = mustache.sexpr;
     var type = this.classifySexpr(sexpr);
 
     if (type === "helper") {
diff --git a/lib/handlebars/compiler/helpers.js b/lib/handlebars/compiler/helpers.js
index 20f13d6..c9a35c2 100644
--- a/lib/handlebars/compiler/helpers.js
+++ b/lib/handlebars/compiler/helpers.js
@@ -12,17 +12,35 @@ export function stripComment(comment) {
                 .replace(/-?-?~?\}\}$/, '');
 }
 
+export function prepareRawBlock(openRawBlock, content, close, locInfo) {
+  /*jshint -W040 */
+  if (openRawBlock.sexpr.id.original !== close) {
+    var errorNode = {
+      firstLine: openRawBlock.sexpr.firstLine,
+      firstColumn: openRawBlock.sexpr.firstColumn
+    };
+
+    throw new Exception(openRawBlock.sexpr.id.original + " doesn't match " + close, errorNode);
+  }
 
-export function prepareBlock(mustache, program, inverseAndProgram, close, inverted, locInfo) {
+  return new this.RawBlockNode(openRawBlock.sexpr, content, locInfo);
+}
+
+export function prepareBlock(openBlock, program, inverseAndProgram, close, inverted, locInfo) {
   /*jshint -W040 */
-  if (mustache.sexpr.id.original !== close.path.original) {
-    throw new Exception(mustache.sexpr.id.original + ' doesn\'t match ' + close.path.original, mustache);
+  if (openBlock.sexpr.id.original !== close.path.original) {
+    var errorNode = {
+      firstLine: openBlock.sexpr.firstLine,
+      firstColumn: openBlock.sexpr.firstColumn
+    };
+
+    throw new Exception(openBlock.sexpr.id.original + ' doesn\'t match ' + close.path.original, errorNode);
   }
 
   var inverse = inverseAndProgram && inverseAndProgram.program;
 
   var strip = {
-    left: mustache.strip.left,
+    left: openBlock.strip.left,
     right: close.strip.right,
 
     // Determine the standalone candiacy. Basically flag our content as being possibly standalone
@@ -31,7 +49,7 @@ export function prepareBlock(mustache, program, inverseAndProgram, close, invert
     closeStandalone: isPrevWhitespace((inverse || program).statements)
   };
 
-  if (mustache.strip.right) {
+  if (openBlock.strip.right) {
     omitRight(program.statements, null, true);
   }
 
@@ -62,9 +80,9 @@ export function prepareBlock(mustache, program, inverseAndProgram, close, invert
   }
 
   if (inverted) {
-    return new this.BlockNode(mustache, inverse, program, strip, locInfo);
+    return new this.BlockNode(openBlock.sexpr, inverse, program, strip, locInfo);
   } else {
-    return new this.BlockNode(mustache, program, inverse, strip, locInfo);
+    return new this.BlockNode(openBlock.sexpr, program, inverse, strip, locInfo);
   }
 }
 
diff --git a/lib/handlebars/compiler/printer.js b/lib/handlebars/compiler/printer.js
index 7654245..c329373 100644
--- a/lib/handlebars/compiler/printer.js
+++ b/lib/handlebars/compiler/printer.js
@@ -40,7 +40,7 @@ PrintVisitor.prototype.block = function(block) {
 
   out = out + this.pad("BLOCK:");
   this.padding++;
-  out = out + this.accept(block.mustache);
+  out = out + this.pad(this.accept(block.sexpr));
   if (block.program) {
     out = out + this.pad("PROGRAM:");
     this.padding++;