diff --git a/Model/Message.php b/Model/Message.php
index c4c8c442..3944f0a7 100644
--- a/Model/Message.php
+++ b/Model/Message.php
@@ -116,7 +116,7 @@ public function isNew()
 
     public function getLocaleString()
     {
-        return $this->localeString ?: ($this->desc ?: $this->id);
+        return $this->localeString !== null ? $this->localeString : ($this->desc !== null ? $this->desc : $this->id);
     }
 
     /**
diff --git a/Translation/Dumper/YamlDumper.php b/Translation/Dumper/YamlDumper.php
index 9bc02fb1..8a38a77f 100644
--- a/Translation/Dumper/YamlDumper.php
+++ b/Translation/Dumper/YamlDumper.php
@@ -53,6 +53,7 @@ private function dumpStructureRecursively(array $structure)
                 }
 
                 if ($desc) {
+                    $desc = str_replace(array("\r\n", "\n", "\r", "\t"), array('\r\n', '\n', '\r', '\t'), $desc);
                     $this->writer->writeln('# Desc: '.$desc);
                 }
                 if ($meaning) {