1 files changed, 6 insertions, 2 deletions
diff --git a/core/controllers/welcome.php b/core/controllers/welcome.php
index b341b1af..9ac22318 100644
--- a/core/controllers/welcome.php
+++ b/core/controllers/welcome.php
@@ -21,7 +21,11 @@ class Welcome_Controller extends Template_Controller {
   public $template = "welcome.html";
 
   function index() {
-    Session::instance();
+    try {
+      $session = Session::instance();
+    } catch (Exception $e) {
+    }
+
     $this->template->syscheck = new View("welcome_syscheck.html");
     $this->template->syscheck->errors = $this->_get_config_errors();
     $this->template->syscheck->modules = array();
@@ -52,7 +56,7 @@ class Welcome_Controller extends Template_Controller {
 
     $this->_create_directories();
 
-    if (Session::instance()->get("profiler", false)) {
+    if (!empty($session) && $session->get("profiler", false)) {
       $profiler = new Profiler();
       $profiler->render();
     }