diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
index be218049efe..501ae1fcf2d 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/CardPanel.java
@@ -866,7 +866,7 @@ public abstract class CardPanel extends MagePermanent implements ComponentListen
             // alternative side -> main side
             copySelections(this.cardSideOther, this.cardSideMain);
             update(this.cardSideMain);
-            this.getGameCard().setAlternateName(this.cardSideOther.getName()); // wtf null protect
+            this.getGameCard().setAlternateName(this.cardSideOther.getName());
         }
 
         updateArtImage();
diff --git a/Mage/src/main/java/mage/cards/mock/MockCard.java b/Mage/src/main/java/mage/cards/mock/MockCard.java
index 1e94fe8d553..cb763203f53 100644
--- a/Mage/src/main/java/mage/cards/mock/MockCard.java
+++ b/Mage/src/main/java/mage/cards/mock/MockCard.java
@@ -179,6 +179,6 @@ public class MockCard extends CardImpl {
     @Override
     public boolean isTransformable() {
         // must enable toggle mode in deck editor (switch between card sides);
-        return super.isTransformable() || this.isModalDoubleFacesCard;
+        return super.isTransformable() || this.isModalDoubleFacesCard || this.secondSideCard != null;
     }
 }