diff --git a/core/model/RedirectorPage.php b/core/model/RedirectorPage.php
index 8d162c8dc..224ba558f 100755
--- a/core/model/RedirectorPage.php
+++ b/core/model/RedirectorPage.php
@@ -156,12 +156,10 @@ class RedirectorPage_Controller extends Page_Controller {
 	/**
 	 * If we ever get this far, it means that the redirection failed.
 	 */
-	function index() {
-		return new SS_HTTPResponse(
-			"<p class=\"message-setupWithoutRedirect\">" .
+	function Content() {
+		return "<p class=\"message-setupWithoutRedirect\">" .
 			_t('RedirectorPage.HASBEENSETUP', 'A redirector page has been set up without anywhere to redirect to.') .
-			"</p>"
-		);
+			"</p>";
 	}
 }
 ?>
diff --git a/core/model/VirtualPage.php b/core/model/VirtualPage.php
index c2d77ec29..7f14f9dd9 100755
--- a/core/model/VirtualPage.php
+++ b/core/model/VirtualPage.php
@@ -261,6 +261,13 @@ class VirtualPage extends Page {
 		if (!$haveIt) $haveIt = $this->copyContentFrom()->hasMethod($method);		
 		return $haveIt;
 	}
+	
+	/**
+	 * If we ever get this far, it means that the VP failed.
+	 */
+	function Content() {
+		return '<p>'._t('VirtualPage.NOTFOUND', 'We could not find the content for this virtual page.').'</p>';
+	}
 }
 
 /**