diff --git a/src/Extensions/SiteTreeExtension.php b/src/Extensions/SiteTreeExtension.php
index 56bdf96..5acd1ce 100755
--- a/src/Extensions/SiteTreeExtension.php
+++ b/src/Extensions/SiteTreeExtension.php
@@ -103,6 +103,10 @@ class SiteTreeExtension extends DataExtension
             return $this->_cached['summary' . $wordsToDisplay];
         }
 
+        if(!method_exists($obj, 'ElementalArea')) {
+            return;
+        }
+
         $element = ElementContent::get()->filter([
             'ParentID' => $obj->ElementalArea()->ID,
             'HTML:not' => [null],
diff --git a/templates/Page.ss b/templates/Page.ss
index b3c9be4..6a116c8 100755
--- a/templates/Page.ss
+++ b/templates/Page.ss
@@ -16,8 +16,8 @@
             <% include Header %>
         </header>
 
-        <div id="MainContent" class="page-content" data-ajax-region="LayoutAjax">
-            <% if $isFormResponse %>
+        <div id="MainContent" class="page-content" data-ajax-region="LayoutAjax"<% if $isLegacy %> data-legacy="true"<% end_if %>>
+            <% if $isFormResponse || $isLegacy %>
                 <%-- Legacy code compatibility --%>
                 <% include MainContent Layout=$Layout %>
             <% end_if %>