diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index 5e544903a..d0c69a80d 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -350,7 +350,7 @@ class adminAdminModel extends admin
 		$info['module'] = '';
 		$oModuleModel = getModel('module');
 		$module_list = $oModuleModel->getModuleList();
-		foreach($module_list as $module)
+		if($module_list) foreach($module_list as $module)
 		{
 			if(in_array($module->module, $skip['module']))
 			{
@@ -363,7 +363,7 @@ class adminAdminModel extends admin
 		$info['addon'] = '';
 		$oAddonAdminModel = getAdminModel('addon');
 		$addon_list = $oAddonAdminModel->getAddonList();
-		foreach($addon_list as $addon)
+		if($addon_list) foreach($addon_list as $addon)
 		{
 			if(in_array($addon->addon, $skip['addon']))
 			{
@@ -376,7 +376,7 @@ class adminAdminModel extends admin
 		$info['layout'] = "";
 		$oLayoutModel = getModel('layout');
 		$layout_list = $oLayoutModel->getDownloadedLayoutList();
-		foreach($layout_list as $layout)
+		if($layout_list) foreach($layout_list as $layout)
 		{
 			if(in_array($layout->layout, $skip['layout']))
 			{
@@ -389,7 +389,7 @@ class adminAdminModel extends admin
 		$info['widget'] = "";
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
-		foreach($widget_list as $widget)
+		if($widget_list) foreach($widget_list as $widget)
 		{
 			if(in_array($widget->widget, $skip['widget']))
 			{
@@ -402,7 +402,7 @@ class adminAdminModel extends admin
 		$info['widgetstyle'] = "";
 		$oWidgetModel = getModel('widget');
 		$widgetstyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-		foreach($widgetstyle_list as $widgetstyle)
+		if($widgetstyle_list) foreach($widgetstyle_list as $widgetstyle)
 		{
 			if(in_array($widgetstyle->widgetStyle, $skip['widgetstyle']))
 			{
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index 70202c1aa..9305d6ae0 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -61,6 +61,9 @@ class memberAdminController extends member
 		unset($all_args->success_return_url);
 		unset($all_args->ruleset);
 		if(!isset($args->limit_date)) $args->limit_date = "";
+		unset($all_args->password);
+		unset($all_args->password2);
+		unset($all_args->reset_password);
 		// Add extra vars after excluding necessary information from all the requested arguments
 		$extra_vars = delObjectVars($all_args, $args);
 		$args->extra_vars = serialize($extra_vars);
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 9ad09f733..f2c42543e 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -746,7 +746,6 @@ class moduleModel extends module
 
 		// Module Information
 		$module_info = new stdClass();
-		$author_obj = new stdClass();
 		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// module format 0.2
@@ -766,6 +765,7 @@ class moduleModel extends module
 
 			foreach($author_list as $author)
 			{
+				$author_obj = new stdClass();
 				$author_obj->name = $author->name->body;
 				$author_obj->email_address = $author->attrs->email_address;
 				$author_obj->homepage = $author->attrs->link;