1 files changed, 7 insertions, 4 deletions
diff --git a/ishtar_common/ooo_replace.py b/ishtar_common/ooo_replace.py
index 73d855a8d..346ef75a4 100644
--- a/ishtar_common/ooo_replace.py
+++ b/ishtar_common/ooo_replace.py
@@ -66,10 +66,13 @@ def _format_value(value, default_value):
                 locale.setlocale(locale.LC_ALL, c_locale)
             except:
                 pass
-        if settings.DATE_FORMAT:
-            value = value.strftime(settings.DATE_FORMAT).lower()
-        else:
-            value = value.strftime('%x')
+        try:
+            if settings.DATE_FORMAT:
+                value = value.strftime(settings.DATE_FORMAT).lower()
+            else:
+                value = value.strftime('%x')
+        except ValueError:
+            value = unicode(value)
         if locale.getlocale()[1]:
             value = value.decode(locale.getlocale()[1])
     value = unicode(value) if value else default_value