6 files changed, 16 insertions, 12 deletions
diff --git a/library/WT/Controller/Family.php b/library/WT/Controller/Family.php
index 3d5536aa80..726f077df5 100644
--- a/library/WT/Controller/Family.php
+++ b/library/WT/Controller/Family.php
@@ -146,7 +146,7 @@ class WT_Controller_Family extends WT_Controller_Base {
 		if ($this->family) {
 			return $this->family->getFullName();
 		} else {
-			return WT_I18N::translate('Unable to find record with ID');
+			return WT_I18N::translate('Family');
 		}
 	}
 
diff --git a/library/WT/Controller/Individual.php b/library/WT/Controller/Individual.php
index ddaa9bc035..cfcedaae4d 100644
--- a/library/WT/Controller/Individual.php
+++ b/library/WT/Controller/Individual.php
@@ -204,10 +204,14 @@ class WT_Controller_Individual extends WT_Controller_Base {
 	* @return string the title of the page to go in the <title> tags
 	*/
 	function getPageTitle() {
-		if ($this->indi->canDisplayDetails()) {
-			return $this->indi->getFullName().' '.$this->indi->getLifespan();
+		if ($this->indi) {
+			if ($this->indi->canDisplayDetails()) {
+				return $this->indi->getFullName().' '.$this->indi->getLifespan();
+			} else {
+				return $this->indi->getFullName();
+			}
 		} else {
-			return $this->indi->getFullName();
+			return WT_I18N::translate('Individual');
 		}
 	}
 
diff --git a/library/WT/Controller/Media.php b/library/WT/Controller/Media.php
index c8e06b8814..519a808ae4 100644
--- a/library/WT/Controller/Media.php
+++ b/library/WT/Controller/Media.php
@@ -153,9 +153,9 @@ class WT_Controller_Media extends WT_Controller_Base {
 	*/
 	function getPageTitle() {
 		if ($this->mediaobject) {
-			return $this->mediaobject->getFullName()." - ".WT_I18N::translate('Media file');
+			return $this->mediaobject->getFullName();
 		} else {
-			return WT_I18N::translate('Unable to find record with ID');
+			return WT_I18N::translate('Media object');
 		}
 	}
 
diff --git a/library/WT/Controller/Note.php b/library/WT/Controller/Note.php
index 9baf0c758d..51ae2a5b2b 100644
--- a/library/WT/Controller/Note.php
+++ b/library/WT/Controller/Note.php
@@ -117,9 +117,9 @@ class WT_Controller_Note extends WT_Controller_Base {
 	*/
 	function getPageTitle() {
 		if ($this->note) {
-			return $this->note->getFullName()." - ".WT_I18N::translate('Shared Note Information');
+			return $this->note->getFullName();
 		} else {
-			return WT_I18N::translate('Unable to find record with ID');
+			return WT_I18N::translate('Note');
 		}
 	}
 
diff --git a/library/WT/Controller/Repository.php b/library/WT/Controller/Repository.php
index 266312dc09..173f6fb8ed 100644
--- a/library/WT/Controller/Repository.php
+++ b/library/WT/Controller/Repository.php
@@ -117,9 +117,9 @@ class WT_Controller_Repository extends WT_Controller_Base {
 	*/
 	function getPageTitle() {
 		if ($this->repository) {
-			return $this->repository->getFullName()." - ".WT_I18N::translate('Repository information');
+			return $this->repository->getFullName();
 		} else {
-			return WT_I18N::translate('Unable to find record with ID');
+			return WT_I18N::translate('Repository');
 		}
 	}
 
diff --git a/library/WT/Controller/Source.php b/library/WT/Controller/Source.php
index 0a5defbe1d..3f3ed04631 100644
--- a/library/WT/Controller/Source.php
+++ b/library/WT/Controller/Source.php
@@ -117,9 +117,9 @@ class WT_Controller_Source extends WT_Controller_Base {
 	*/
 	function getPageTitle() {
 		if ($this->source) {
-			return $this->source->getFullName()." - ".WT_I18N::translate('Source Information');
+			return $this->source->getFullName();
 		} else {
-			return WT_I18N::translate('Unable to find record with ID');
+			return WT_I18N::translate('Source');
 		}
 	}