Index: OutputPage.php
===================================================================
--- OutputPage.php	(revision 102633)
+++ OutputPage.php	(working copy)
@@ -1969,14 +1969,19 @@
 	 *                   optional, if not passed the <title> attribute will be
 	 *                   based on $pageTitle
 	 */
-	public function prepareErrorPage( $pageTitle, $htmlTitle = false ) {
+	public function prepareErrorPage( $pageTitle) {
+		$htmlTitle = $this->msg( 'errorpagetitle' );
+
 		if ( $this->getTitle() ) {
 			$this->mDebugtext .= 'Original title: ' . $this->getTitle()->getPrefixedText() . "\n";
 		}
 
 		$this->setPageTitle( $pageTitle );
 		if ( $htmlTitle !== false ) {
-			$this->setHTMLTitle( $htmlTitle );
+			//Combines the error page title with the title so that we have
+			//a better page title i.e. Error: No such special page
+			//rather than just Error
+			$this->setHTMLTitle( $htmlTitle.": ". $pageTitle );
 		}
 		$this->setRobotPolicy( 'noindex,nofollow' );
 		$this->setArticleRelated( false );
@@ -1997,7 +2002,7 @@
 	 * @param $params Array: message parameters; ignored if $msg is a Message object
 	 */
 	public function showErrorPage( $title, $msg, $params = array() ) {
-		$this->prepareErrorPage( $this->msg( $title ), $this->msg( 'errorpagetitle' ) );
+		$this->prepareErrorPage( $this->msg( $title ) );
 
 		if ( $msg instanceof Message ){
 			$this->addHTML( $msg->parse() );