diff --git a/src/DatabaseExporter.php b/src/DatabaseExporter.php
index d576499f..2e367c68 100644
--- a/src/DatabaseExporter.php
+++ b/src/DatabaseExporter.php
@@ -302,7 +302,14 @@ protected function buildXmlData()
 				{
 					if (!in_array($key, $colblob))
 					{
-						$buffer[] = '    <field name="' . $key . '">' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '</field>';
+						if (is_null($value))
+						{
+							$buffer[] = '    <field name="' . $key . '" value_is_null></field>';
+						}
+						else
+						{
+							$buffer[] = '    <field name="' . $key . '">' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '</field>';
+						}
 					}
 					else
 					{
diff --git a/src/DatabaseImporter.php b/src/DatabaseImporter.php
index fe704d8d..4eabbdd5 100644
--- a/src/DatabaseImporter.php
+++ b/src/DatabaseImporter.php
@@ -267,7 +267,14 @@ public function importData()
 
 					foreach ($row->children() as $data)
 					{
-						$entry->{(string) $data['name']} = (string) $data;
+						if (isset($data['value_is_null']))
+						{
+							$entry->{(string) $data['name']} = null;
+						}
+						else
+						{
+							$entry->{(string) $data['name']} = (string) $data;
+						}
 					}
 
 					$this->db->insertObject($tableName, $entry);