From 49d4fbcf3de4b253c4a4491197818bc45c339cf2 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 29 Oct 2015 21:50:58 -0600
Subject: [PATCH] fix for non-existing page with collection `@page: /something`
 format

---
 system/src/Grav/Common/Page/Page.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 8fa66d5aa..f2c6ea2d9 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -1963,7 +1963,7 @@ class Page
         $parts = explode('.', $cmd);
         $current = array_shift($parts);
 
-        $results = null;
+        $results = new Collection();
         switch ($current) {
             case '@self':
                 if (!empty($parts)) {
@@ -2005,8 +2005,13 @@ class Page
                     $page = $this->find($params[0]);
                 }
 
+                // safety check in case page is not found
+                if (!isset($page)) {
+                    return $results;
+                }
+
                 // Handle a @page.descendants
-                if (!empty($parts) && isset($page)) {
+                if (!empty($parts)) {
                     switch ($parts[0]) {
                         case 'self':
                             $results = new Collection();