diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 4934771..93c1dba 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -244,7 +244,7 @@
  *  Close the DB connection if one exists
  * ------------------------------------------------------
  */
-if (class_exists('CI_DB'))
+if (class_exists('CI_DB') AND isset($CI->db))
 {
 	$CI->db->close();
 }