diff --git a/includes/EditPage.php b/includes/EditPage.php
index cc41b026885..4a1e5170f5c 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -776,6 +776,9 @@ class EditPage {
 		$this->edittime = $this->mArticle->getTimestamp();
 
 		$content = $this->getContentObject( false ); #TODO: track content object?!
+		if ( $content === false ) {
+			return false;
+		}
 		$this->textbox1 = $this->toEditText( $content );
 
 		// activate checkboxes if user wants them to be always active