diff --git a/workflow/engine/classes/model/AdditionalTables.php b/workflow/engine/classes/model/AdditionalTables.php
index 085e96a97..b48ea9125 100755
--- a/workflow/engine/classes/model/AdditionalTables.php
+++ b/workflow/engine/classes/model/AdditionalTables.php
@@ -564,6 +564,25 @@ class AdditionalTables extends BaseAdditionalTables {
       $rs = $stmt->executeQuery($deleteSql);
       // getting the case data
       $caseData = unserialize($row['APP_DATA']);
+
+      // quick fix
+      // map all empty values as NULL for Database
+      foreach ($caseData as $dKey => $dValue) {
+        if (!is_array($dValue)) { // normal fields
+          if (trim($dValue) === '') {
+            $caseData[$dKey] = NULL;
+          }
+        }
+        else { // grids
+          foreach ($caseData[$dKey] as $dIndex => $dRow) {
+            foreach ($dRow as $k => $v) {
+              if (trim($v) === '') {
+                $caseData[$dKey][$dIndex][$k] = NULL;
+              }
+            }
+          }
+        }
+      }
       
       if ($type == 'GRID') {
         list($gridName, $gridUid)  = explode('-', $gridKey);
diff --git a/workflow/engine/templates/pmTables/data.js b/workflow/engine/templates/pmTables/data.js
index 0476c92f9..3b4ada78f 100755
--- a/workflow/engine/templates/pmTables/data.js
+++ b/workflow/engine/templates/pmTables/data.js
@@ -92,6 +92,8 @@ Ext.onReady(function(){
     switch (tableDef.FIELDS[i].FLD_TYPE) {
       case 'DATE':
         columnRenderer = function (value) { 
+          if (!value) return;
+
           if (!value.dateFormat)
             return value;
           else