diff --git a/e107_handlers/cache_handler.php b/e107_handlers/cache_handler.php
index 652665481..6adc1df26 100644
--- a/e107_handlers/cache_handler.php
+++ b/e107_handlers/cache_handler.php
@@ -73,7 +73,7 @@ class ecache {
 					// It's a page - need the query in the hash
 					if (!$this->CachePageMD5)
 					{
-						$this->CachePageMD5 = md5(e_BASE.e_LANGUAGE.THEME.USERCLASS_LIST.e_QUERY.filemtime(THEME.'theme.php'));
+						$this->CachePageMD5 = md5(e_BASE.e_LANGUAGE.THEME.USERCLASS_LIST.defset('e_QUERY').filemtime(THEME.'theme.php'));
 					}
 					$CheckTag = '_'.$this->CachePageMD5;
 				}
diff --git a/e107_handlers/redirection_class.php b/e107_handlers/redirection_class.php
index fca5aa3d9..63c0f5a0e 100644
--- a/e107_handlers/redirection_class.php
+++ b/e107_handlers/redirection_class.php
@@ -196,12 +196,12 @@ class redirection
 	public function checkMaintenance()
 	{
 		// prevent looping.
-		if(strpos(e_SELF, 'admin.php') !== FALSE || strpos(e_SELF, 'sitedown.php') !== FALSE)
+		if(strpos(defset('e_SELF'), 'admin.php') !== FALSE || strpos(defset('e_SELF'), 'sitedown.php') !== FALSE)
 		{
 			return;
 		}
 		
-		if(e107::getPref('maintainance_flag') && e_PAGE != 'secure_img_render.php')
+		if(e107::getPref('maintainance_flag') && defset('e_PAGE') != 'secure_img_render.php')
 		{
 			// if not admin
 			if(!ADMIN