1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index c07a76060..da323fbf1 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -61,7 +61,7 @@ private
                  l(:field_hours),
                  l(:field_comments)
                  ]
-      csv << headers.collect {|c| ic.iconv(c) }
+      csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       # csv lines
       @entries.each do |entry|
         fields = [l_date(entry.spent_on),
@@ -71,7 +71,7 @@ private
                   entry.hours,
                   entry.comments
                   ]
-        csv << fields.collect {|c| ic.iconv(c.to_s) }
+        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       end
     end
     export.rewind