diff --git a/src/main/java/forge/deck/Deck.java b/src/main/java/forge/deck/Deck.java
index 8bfeee91964..b0544652cba 100644
--- a/src/main/java/forge/deck/Deck.java
+++ b/src/main/java/forge/deck/Deck.java
@@ -152,8 +152,7 @@ public final class Deck implements Comparable<Deck>, Serializable {
      * @return a {@link java.lang.String} object.
      */
     public String getComment() {
-        return comment;
-
+        return comment == null ? "" : comment;
     }
 
     /**
diff --git a/src/main/java/forge/deck/DeckManager.java b/src/main/java/forge/deck/DeckManager.java
index 55ed3dd5e8e..a10acf67056 100644
--- a/src/main/java/forge/deck/DeckManager.java
+++ b/src/main/java/forge/deck/DeckManager.java
@@ -469,8 +469,8 @@ public class DeckManager {
         
         out.write(format("%s=%s%n", NAME, d.getName().replaceAll("\n", "")));
         out.write(format("%s=%s%n", DECK_TYPE, d.getDeckType().replaceAll("\n", "")));
-        out.write(format("%s=%s%n", PLAYER, d.getPlayerType()));
         out.write(format("%s=%s%n", COMMENT, d.getComment().replaceAll("\n", "")));
+        out.write(format("%s=%s%n", PLAYER, d.getPlayerType()));
 
         out.write(format("%s%n", "[main]"));
         for (Entry<CardPrinted, Integer> e : d.getMain()) {