diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 7164579b6..700715be2 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -1,21 +1,28 @@
 <?php
 /*
-+ ----------------------------------------------------------------------------+
-|     e107 website system
-|
-|     Copyright (C) 2008-2009 e107 Inc (e107.org)
-|     http://e107.org
-|
-|
-|     Released under the terms and conditions of the
-|     GNU General Public License (http://gnu.org).
-|
-|     $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
-|     $Revision$
-|     $Date$
-|     $Author$
-+----------------------------------------------------------------------------+
-*/
+ * e107 website system
+ *
+ * Copyright (C) 2008-2012 e107 Inc (e107.org)
+ * Released under the terms and conditions of the
+ * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+if (!defined('e107_INIT')) { exit; }
+
+
+/**
+ *
+ * @package     e107
+ * @category	e107_handlers
+ * @version     $Id$
+ * @author      e107inc
+ *
+ *	Plugin administration area
+ */
 
 require_once("../class2.php");
 if (!getperms("Z"))
@@ -202,7 +209,7 @@ class pluginManager{
 			$plugin = e107::getPlugin();
 			$tp = e107::getParser();
 			$sql = e107::getDb();
-			
+			$eplug_folder = '';
 			if(!isset($_POST['uninstall_confirm']))
 			{	// $id is already an integer
 				$this->pluginConfirmUninstall($this->id);
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index cb84764f2..4989f0345 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -2,23 +2,29 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2012 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
- * Administration - Site Maintenance
- *
  * $URL$
  * $Id$
  *
  */
 
-if (!defined('e107_INIT'))
-{
-	exit;
-}
+if (!defined('e107_INIT')) { exit; }
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_plugin.php');
+
+/**
+ *
+ * @package     e107
+ * @category	e107_handlers
+ * @version     $Id$
+ * @author      e107inc
+ *
+ *	Plugin administration handler
+ */
+
+e107::coreLan('plugin', true);
 
 class e107plugin
 {
@@ -1524,7 +1530,7 @@ class e107plugin
 			$attrib = $link['@attributes'];
 			$linkName = (defset($link['@value'])) ? constant($link['@value']) : $link['@value'];
 			$url = e_PLUGIN_ABS.$this->plugFolder."/".$attrib['url'];
-			if ($attrib['primary'] == 'true')
+			if (isset($attrib['primary']) && $attrib['primary'] == 'true')
 			{
 				$this->plugConfigFile = $url;
 			}