diff --git a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
index 6bbf237cce..87b06a62dd 100644
--- a/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
+++ b/Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
@@ -22,7 +22,6 @@ import javax.swing.JPopupMenu;
 import javax.swing.Popup;
 import javax.swing.PopupFactory;
 import javax.swing.SwingUtilities;
-
 import mage.cards.MageCard;
 import mage.cards.action.ActionCallback;
 import mage.cards.action.TransferData;
@@ -177,21 +176,21 @@ public class MageActionCallback implements ActionCallback {
             public void showPopup(final Component popupContainer, final Component infoPane) throws InterruptedException {
                 final Component c = MageFrame.getUI().getComponent(MageComponents.DESKTOP_PANE);
                 SwingUtilities.invokeLater(() -> {
-                            if (!popupTextWindowOpen
-                                    || enlargedWindowState != EnlargedWindowState.CLOSED) {
-                                return;
-                            }
-                            if (data.locationOnScreen == null) {
-                                data.locationOnScreen = data.component.getLocationOnScreen();
-                            }
+                    if (!popupTextWindowOpen
+                            || enlargedWindowState != EnlargedWindowState.CLOSED) {
+                        return;
+                    }
+                    if (data.locationOnScreen == null) {
+                        data.locationOnScreen = data.component.getLocationOnScreen();
+                    }
 
-                            Point location = new Point((int) data.locationOnScreen.getX() + data.popupOffsetX - 40, (int) data.locationOnScreen.getY() + data.popupOffsetY - 40);
-                            location = GuiDisplayUtil.keepComponentInsideParent(location, parentPoint, infoPane, parentComponent);
-                            location.translate(-parentPoint.x, -parentPoint.y);
-                            popupContainer.setLocation(location);
-                            popupContainer.setVisible(true);
-                            c.repaint();
-                        }
+                    Point location = new Point((int) data.locationOnScreen.getX() + data.popupOffsetX - 40, (int) data.locationOnScreen.getY() + data.popupOffsetY - 40);
+                    location = GuiDisplayUtil.keepComponentInsideParent(location, parentPoint, infoPane, parentComponent);
+                    location.translate(-parentPoint.x, -parentPoint.y);
+                    popupContainer.setLocation(location);
+                    popupContainer.setVisible(true);
+                    c.repaint();
+                }
                 );
             }
         });
@@ -463,7 +462,7 @@ public class MageActionCallback implements ActionCallback {
         int notches = e.getWheelRotation();
         if (enlargedWindowState != EnlargedWindowState.CLOSED) {
             // same move direction will be ignored, opposite direction closes the enlarged window
-            if (new Date().getTime() - enlargeredViewOpened.getTime() > 1000) {
+            if (enlargeredViewOpened != null && new Date().getTime() - enlargeredViewOpened.getTime() > 1000) {
                 // if the opening is back more than 1 seconds close anyway
                 hideEnlargedCard();
                 handleOverNewView(transferData);
@@ -491,7 +490,7 @@ public class MageActionCallback implements ActionCallback {
      * Show the big card image on mouse position while hovering over a card
      *
      * @param showAlternative defines if the original image (if it's a copied
-     *                        card) or the opposite side of a transformable card will be shown
+     * card) or the opposite side of a transformable card will be shown
      */
     public void enlargeCard(EnlargeMode showAlternative) {
         if (enlargedWindowState == EnlargedWindowState.CLOSED) {
diff --git a/Mage.Common/src/main/java/mage/view/CardView.java b/Mage.Common/src/main/java/mage/view/CardView.java
index 3218f2729b..5471d549f0 100644
--- a/Mage.Common/src/main/java/mage/view/CardView.java
+++ b/Mage.Common/src/main/java/mage/view/CardView.java
@@ -29,7 +29,6 @@ package mage.view;
 
 import java.util.*;
 import java.util.stream.Collectors;
-
 import mage.MageObject;
 import mage.ObjectColor;
 import mage.abilities.Abilities;
@@ -66,7 +65,7 @@ public class CardView extends SimpleCardView {
     protected List<String> rules;
     protected String power;
     protected String toughness;
-    protected String loyalty;
+    protected String loyalty = "";
     protected String startingLoyalty;
     protected EnumSet<CardType> cardTypes;
     protected List<String> subTypes;
@@ -220,8 +219,8 @@ public class CardView extends SimpleCardView {
      * @param card
      * @param game
      * @param controlled is the card view created for the card controller - used
-     *                   for morph / face down cards to know which player may see information for
-     *                   the card
+     * for morph / face down cards to know which player may see information for
+     * the card
      */
     public CardView(Card card, Game game, boolean controlled) {
         this(card, game, controlled, false, false);
@@ -247,12 +246,12 @@ public class CardView extends SimpleCardView {
     /**
      * @param card
      * @param game
-     * @param controlled       is the card view created for the card controller - used
-     *                         for morph / face down cards to know which player may see information for
-     *                         the card
+     * @param controlled is the card view created for the card controller - used
+     * for morph / face down cards to know which player may see information for
+     * the card
      * @param showFaceDownCard if true and the card is not on the battlefield,
-     *                         also a face down card is shown in the view, face down cards will be shown
-     * @param storeZone        if true the card zone will be set in the zone attribute.
+     * also a face down card is shown in the view, face down cards will be shown
+     * @param storeZone if true the card zone will be set in the zone attribute.
      */
     public CardView(Card card, Game game, boolean controlled, boolean showFaceDownCard, boolean storeZone) {
         super(card.getId(), card.getExpansionSetCode(), card.getCardNumber(), card.getUsesVariousArt(), card.getTokenSetCode(), game != null, card.getTokenDescriptor());
@@ -967,7 +966,7 @@ public class CardView extends SimpleCardView {
     public String getColorText() {
 
         String color = getColor().getDescription();
-        return color.substring(0,1).toUpperCase() + color.substring(1);
+        return color.substring(0, 1).toUpperCase() + color.substring(1);
     }
 
     public String getTypeText() {