diff --git a/fp-includes/core/core.plugins.php b/fp-includes/core/core.plugins.php
index f3f469f..208ad09 100644
--- a/fp-includes/core/core.plugins.php
+++ b/fp-includes/core/core.plugins.php
@@ -174,10 +174,12 @@
 	function plugin_getoptions($plugin, $key=null) {
 		global $fp_config;
 		
-		if ($key)
-			return @$fp_config['plugins'][ $plugin ][ $key ];
+		if ($key && isset($fp_config['plugins'][ $plugin ][ $key ]))
+			return $fp_config['plugins'][ $plugin ][ $key ];
 		
-		return @$fp_config['plugins'][ $plugin ];
+		return isset($fp_config['plugins'][ $plugin ])?
+			$fp_config['plugins'][ $plugin ]
+			: null;
 	}
 	
 	function plugin_addoption($plugin, $key, $val) {
diff --git a/fp-includes/core/core.system.php b/fp-includes/core/core.system.php
index aeb08af..1d5e51b 100755
--- a/fp-includes/core/core.system.php
+++ b/fp-includes/core/core.system.php
@@ -169,9 +169,9 @@
 		
 		ob_start();
 		
-		$GLOBALS['theme'] =& theme_loadsettings();
+		$GLOBALS['theme'] = theme_loadsettings();
 		
-		$GLOBALS['lang'] =& lang_load();
+		$GLOBALS['lang'] = lang_load();
 		
 
 		plugin_loadall();