diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index 3c451ca32..abe9375cd 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -285,7 +285,7 @@
                         break;
                 }
 
-                if($default && !is_int($default)) $default = "'".$default."'";
+                if($default && !is_numeric($default)) $default = "'".$default."'";
 
                 $column_schema[] = sprintf('"%s" %s%s %s %s',
                     $name,
@@ -359,8 +359,10 @@
 
             foreach($column as $key => $val) {
                 $key_list[] = $key;
-                if(is_int($val) || in_array($key, $pass_quotes)) $val_list[] = $this->addQuotes($val);
-                else $val_list[] = '\''.$this->addQuotes($val).'\'';
+                if($val) {
+                    if(is_numeric($val) || in_array($key, $pass_quotes)) $val_list[] = $this->addQuotes($val);
+                    else $val_list[] = "'".$this->addQuotes($val)."'";
+                } else $val_list[] = "null";
             }
 
             $query = sprintf("insert into %s%s (%s) values (%s);", $this->prefix, $table, '"'.implode('","',$key_list).'"', implode(',', $val_list));
@@ -374,10 +376,12 @@
             $table = array_pop($tables);
 
             foreach($column as $key => $val) {
-                // args에 아예 해당 key가 없으면 패스
                 if(!isset($args->{$key})) continue;
-                if(is_int($val) || in_array($key, $pass_quotes)) $update_list[] = sprintf('"%s" = %s', $key, $this->addQuotes($val));
-                else $update_list[] = sprintf('"%s" = \'%s\'', $key, $this->addQuotes($val));
+
+                if($vla) {
+                    if(is_numeric($val) || in_array($key, $pass_quotes)) $update_list[] = sprintf('"%s" = %s', $key, $this->addQuotes($val));
+                    else $update_list[] = sprintf('"%s" = \'%s\'', $key, $this->addQuotes($val));
+                } else $update_list[] = "null";
             }
             if(!count($update_list)) return;
             $update_query = implode(',',$update_list);
diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php
index af4054da9..c2929b48f 100644
--- a/classes/xml/XmlQueryParser.class.php
+++ b/classes/xml/XmlQueryParser.class.php
@@ -58,29 +58,29 @@
             // 캐쉬 내용 작성
             $buff = 
             sprintf(
-            '<?php if(!defined("__ZBXE__")) exit();'."\n".
-            '$pass_quotes = array();'."\n".
-            '$id = \'%s\';'."\n".
-            '$action = \'%s\';'."\n".
-            '$tables = array(%s);'."\n".
-            '%s'."\n".
-            '%s'."\n".
-            '%s'."\n".
-            '%s'."\n".
-            '%s'."\n".
-            '%s'."\n".
-            '$group_script = \'%s\''."\n".
-            '?>',
-            $query_id,
-            $action,
-            $tables,
-            $default_script,
-            $column_script,
-            $notnull_script,
-            $filter_script,
-            $condition_script,
-            $navigation_script,
-            $group_script
+                '<?php if(!defined("__ZBXE__")) exit();'."\n".
+                '$pass_quotes = array();'."\n".
+                '$id = \'%s\';'."\n".
+                '$action = \'%s\';'."\n".
+                '$tables = array(%s);'."\n".
+                '%s'."\n".
+                '%s'."\n".
+                '%s'."\n".
+                '%s'."\n".
+                '%s'."\n".
+                '%s'."\n".
+                '$group_script = \'%s\''."\n".
+                '?>',
+                $query_id,
+                $action,
+                $tables,
+                $default_script,
+                $column_script,
+                $notnull_script,
+                $filter_script,
+                $condition_script,
+                $navigation_script,
+                $group_script
             );
 
             // 저장
diff --git a/modules/module/queries/insertModule.xml b/modules/module/queries/insertModule.xml
index 0bb93a5a0..123a0b8d1 100644
--- a/modules/module/queries/insertModule.xml
+++ b/modules/module/queries/insertModule.xml
@@ -3,8 +3,8 @@
         <table name="modules" />
     </tables>
     <columns>
-        <column name="module_srl" default="module_srl" notnull="notnull" />
-        <column name="module_category_srl" default="module_category_srl" />
+        <column name="module_srl" var="module_srl" notnull="notnull" />
+        <column name="module_category_srl" var="module_category_srl" default="0" />
         <column name="mid" var="mid" notnull="notnull" minlength="1" maxlength="40" />
         <column name="skin" var="skin" minlength="1" maxlength="250" />
         <column name="browser_title" var="browser_title" notnull="notnull" minlength="1" maxlength="250" />