Index: /main/waeup.kofa/trunk/src/waeup/kofa/utils/helpers.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/utils/helpers.py	(revision 8632)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/utils/helpers.py	(revision 8633)
@@ -658,8 +658,16 @@
     This CSV file merging copes with different column orders in both
     CSV files and even with different column sets in both files.
+
+    Also broken/empty CSV files can be handled.
     """
     # sniff the col names
-    row10 = csv.DictReader(open(path1, 'rb')).next()
-    row20 = csv.DictReader(open(path2, 'rb')).next()
+    try:
+        row10 = csv.DictReader(open(path1, 'rb')).next()
+    except StopIteration:
+        row10 = dict()
+    try:
+        row20 = csv.DictReader(open(path2, 'rb')).next()
+    except StopIteration:
+        row20 = dict()
     fieldnames = sorted(list(set(row10.keys() + row20.keys())))
     # now read/write the real data
