From a252d6c6fbd2b9989ab630d74ef476fb9e54bcc6 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Fri, 12 May 2017 15:29:13 +0200
Subject: Fix uncaught exception in error page

Can be triggered by accessing an unknown page like /file/foobar

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 application/errors/error_general.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/errors/error_general.php b/application/errors/error_general.php
index 7dac0c529..14e5e7a2e 100644
--- a/application/errors/error_general.php
+++ b/application/errors/error_general.php
@@ -1,7 +1,7 @@
 <?php
 
 // fancy error page only works if we can load helpers
-if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"])) {
+if (class_exists("CI_Controller") && !isset($GLOBALS["is_error_page"]) && isset(get_instance()->load)) {
 	if (!isset($title)) {
 		$title = "Error";
 	}
-- 
cgit v1.2.3-24-g4f1b