diff --git a/app/models/journal_paper.rb b/app/models/journal_paper.rb
index 61d3c55..6f529d3 100644
--- a/app/models/journal_paper.rb
+++ b/app/models/journal_paper.rb
@@ -204,9 +204,9 @@ class JournalPaper
       end
       value = value.join(" / ")
     when "publication_date"
-      value = self.publication_date.to_date.strftime("%Y-%m-%d") rescue ""
+      value = self.publication_date.strftime("%Y-%m-%d") rescue ""
     when "language"
-       value = I18n.t(self.language) rescue ""
+       value = I18n.t(self.language) if !self.language.nil? rescue ""
     when "abstract"
        value = nl2br(self.abstract)
     when "file"