diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index 280ae8079..76590be7c 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -289,9 +289,11 @@
             $document_list = $oDocumentModel->getDocumentList($args);
             $documents = $document_list->data;
             $output = executeQuery('document.deleteModuleDocument', $args);
-			foreach ($documents as $oDocument){
-            	$document_srl_list[] = $oDocument->document_srl;
-            }
+			if (is_array($documents)){
+				foreach ($documents as $oDocument){
+					$document_srl_list[] = $oDocument->document_srl;
+				}
+			}
 			//remove from cache
 	        $oCacheHandler = &CacheHandler::getInstance('object');
 	        if($oCacheHandler->isSupport()) 
diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php
index 15fbc8cb2..a7ce562c2 100644
--- a/modules/module/module.admin.controller.php
+++ b/modules/module/module.admin.controller.php
@@ -110,6 +110,15 @@
                 foreach($output->data as $key => $val) $grant[$val->name][] = $val->group_srl;
             }
 
+			// get Extra Vars
+			$extra_args->module_srl = $module_srl;
+			$extra_output = executeQueryArray('module.getModuleExtraVars', $extra_args);
+			if ($extra_output->toBool() && is_array($extra_output->data)){
+				foreach($extra_output->data as $info){
+					$extra_vars->{$info->name} = $info->value;
+				}
+			}
+
 
             $oDB = &DB::getInstance();
             $oDB->begin();
@@ -127,6 +136,8 @@
                 $module_srl = $output->get('module_srl');
                 // Grant module permissions
                 if(count($grant)) $oModuleController->insertModuleGrants($module_srl, $grant);
+				if ($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+
             }
 
             $oDB->commit();