diff --git a/packages/optimizer/lib/transformers/OptimizeAmpBind.js b/packages/optimizer/lib/transformers/OptimizeAmpBind.js
index 565249b8f..d14a85ff1 100644
--- a/packages/optimizer/lib/transformers/OptimizeAmpBind.js
+++ b/packages/optimizer/lib/transformers/OptimizeAmpBind.js
@@ -43,7 +43,11 @@ class OptimizeAmpBind {
for (let node = html; node !== null; node = nextNode(node)) {
if (isTemplate(node)) {
node = skipNodeAndChildren(node);
- continue;
+ if (node === null) {
+ break;
+ } else {
+ continue;
+ }
}
const {attribs} = node;
diff --git a/packages/optimizer/spec/transformers/valid/OptimizeAmpBind/template_last/expected_output.html b/packages/optimizer/spec/transformers/valid/OptimizeAmpBind/template_last/expected_output.html
new file mode 100644
index 000000000..a4a7fa942
--- /dev/null
+++ b/packages/optimizer/spec/transformers/valid/OptimizeAmpBind/template_last/expected_output.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+ Hello, AMP world.
+ Must be the very last element. Whitespace after closing tag would alter the test.
+
+
\ No newline at end of file
diff --git a/packages/optimizer/spec/transformers/valid/OptimizeAmpBind/template_last/input.html b/packages/optimizer/spec/transformers/valid/OptimizeAmpBind/template_last/input.html
new file mode 100644
index 000000000..2e7008f8a
--- /dev/null
+++ b/packages/optimizer/spec/transformers/valid/OptimizeAmpBind/template_last/input.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+ Hello, AMP world.
+ Must be the very last element. Whitespace after closing tag would alter the test.