diff --git a/e107_handlers/file_class.php b/e107_handlers/file_class.php
index 97fb1e116..55a456092 100644
--- a/e107_handlers/file_class.php
+++ b/e107_handlers/file_class.php
@@ -20,7 +20,11 @@
  */
 
 if (!defined('e107_INIT')) { exit; }
-@set_time_limit(10 * 60);
+if(SAFE_MODE === false)
+{
+	@set_time_limit(10 * 60);	// throws error in safe-mode. 
+}
+
 //session_write_close();
 @e107_ini_set("max_execution_time", 10 * 60);
 //while (@ob_end_clean()); // kill all output buffering else it eats server resources
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index fa7008830..d9855601d 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -1069,7 +1069,10 @@ class e_navigation
 			unset($temp);
 		}
 	
-	
+		if(!is_array($e107_vars))
+		{
+			return;	
+		}
 	
 		$kpost = '';
 		$text = '';