summaryrefslogtreecommitdiff
path: root/ishtar_common/data_importer.py
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/data_importer.py')
-rw-r--r--ishtar_common/data_importer.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ishtar_common/data_importer.py b/ishtar_common/data_importer.py
index 7717c0e03..defea4da8 100644
--- a/ishtar_common/data_importer.py
+++ b/ishtar_common/data_importer.py
@@ -1315,6 +1315,9 @@ class Importer(object):
if self.import_instance:
self.import_instance.add_imported_line(self.idx_line)
+ if not obj:
+ return
+
if self.import_instance:
if created:
obj.imports.add(self.import_instance)
@@ -2137,7 +2140,7 @@ class Importer(object):
and type(new_val) == str
):
updated_dct[k] = val + "\n" + new_val
- else:
+ elif "defaults" in dct:
for k in dct["defaults"]:
new_val = dct["defaults"][k]
if new_val is None or new_val == "":