diff --git a/e107_admin/update_routines.php b/e107_admin/update_routines.php
index 47a388eef..bc77cb03f 100644
--- a/e107_admin/update_routines.php
+++ b/e107_admin/update_routines.php
@@ -223,13 +223,10 @@ function update_check()
 //--------------------------------------------
 function update_core_prefs($type='')
 {
-	$pref = e107::getPref();
-	global $e107info;
+	global $pref, $e107info; // $pref must be kept as global 
 	$admin_log = e107::getAdminLog();
 	$do_save = FALSE;
 	$should = get_default_prefs();
-	
-	
 
 	$just_check = $type == 'do' ? FALSE : TRUE;		// TRUE if we're just seeing if an update is needed
    
diff --git a/e107_handlers/e107_class.php b/e107_handlers/e107_class.php
index 67d4db829..e5f481518 100644
--- a/e107_handlers/e107_class.php
+++ b/e107_handlers/e107_class.php
@@ -2968,14 +2968,17 @@ class e107
 			define('e_LOGIN', SITEURL.(file_exists(e_BASE.'customlogin.php') ? 'customlogin.php' : 'login.php'));	
 		}
 		
-		$pref = e107::getPref('xurl');
+		$p = e107::getPref();
 		
-		define('XURL_FACEBOOK', vartrue($pref['facebook'],false));
-		define('XURL_TWITTER', vartrue($pref['twitter'],false));
-		define('XURL_YOUTUBE', vartrue($pref['youtube'],false));
-		define('XURL_GOOGLE', vartrue($pref['google'],false));
-		define('XURL_LINKEDIN', vartrue($pref['linkedin'],false));
-				
+		if(varset($p['xurl']) && is_array($p['xurl']))
+		{
+			$pref = $p['xurl'];
+			define('XURL_FACEBOOK', vartrue($pref['facebook'],false));
+			define('XURL_TWITTER', vartrue($pref['twitter'],false));
+			define('XURL_YOUTUBE', vartrue($pref['youtube'],false));
+			define('XURL_GOOGLE', vartrue($pref['google'],false));
+			define('XURL_LINKEDIN', vartrue($pref['linkedin'],false));
+		}		
 		return $this;
 	}