diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index e473ccdbe..6a596b89b 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -59,10 +59,10 @@ module CustomFieldsHelper
   
   # Return a string used to display a custom value
   def format_value(value, field_format)
-    return "" unless value
+    return "" unless value && !value.empty?
     case field_format
     when "date"
-      value.empty? ? "" : l_date(value.to_date)
+      begin; l_date(value.to_date); rescue; value end
     when "bool"
       l_YesNo(value == "1")
     else