2 files changed, 6 insertions, 0 deletions
diff --git a/mod/bookmarks/pages/bookmarks/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
index 3491090a5..be164fcec 100644
--- a/mod/bookmarks/pages/bookmarks/friends.php
+++ b/mod/bookmarks/pages/bookmarks/friends.php
@@ -6,6 +6,9 @@
  */
 
 $owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('bookmarks/all');
+}
 
 elgg_push_breadcrumb($owner->name, "bookmarks/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
diff --git a/mod/bookmarks/pages/bookmarks/owner.php b/mod/bookmarks/pages/bookmarks/owner.php
index 679c986be..7f55e08de 100644
--- a/mod/bookmarks/pages/bookmarks/owner.php
+++ b/mod/bookmarks/pages/bookmarks/owner.php
@@ -6,6 +6,9 @@
  */
 
 $page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('bookmarks/all');
+}
 
 elgg_push_breadcrumb($page_owner->name);