2 files changed, 6 insertions, 0 deletions
diff --git a/mod/file/pages/file/friends.php b/mod/file/pages/file/friends.php
index 0b351efaf..f504bdc1f 100644
--- a/mod/file/pages/file/friends.php
+++ b/mod/file/pages/file/friends.php
@@ -6,6 +6,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('file/all');
+}
 
 elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php
index 4e2ec89d4..fb87af1b2 100644
--- a/mod/file/pages/file/owner.php
+++ b/mod/file/pages/file/owner.php
@@ -9,6 +9,9 @@
 group_gatekeeper();
 
 $owner = elgg_get_page_owner_entity();
+if (!$owner) {
+	forward('file/all');
+}
 
 elgg_push_breadcrumb(elgg_echo('file'), "file/all");
 elgg_push_breadcrumb($owner->name);