diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
index 6fb9e6c6e59..b458617585e 100644
--- a/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/ChooseGenericEffectAi.java
@@ -171,7 +171,7 @@ public class ChooseGenericEffectAi extends SpellAbilityAi {
                     loyalty = sp;
                 }
             }
-            if (sa.getParent().getTargetCard() != null && sa.getParent().getTargetCard().getType().isPlaneswalker()) {
+            if (sa.getParent().getTargetCard() != null && sa.getParent().getTargetCard().isPlaneswalker()) {
                 return loyalty;
             } else {
                 return p1p1;
diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java b/forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java
index 3aa57942e4f..9f9a27ca191 100644
--- a/forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java
+++ b/forge-gui-desktop/src/main/java/forge/screens/match/VAssignCombatDamage.java
@@ -123,6 +123,8 @@ public class VAssignCombatDamage {
             if (panel instanceof CardPanel) {
                 source = ((CardPanel)panel).getCard();
             }
+            if (!damage.containsKey(source))
+                source = null;
 
             final FSkin.Colors brdrColor = VAssignCombatDamage.this.canAssignTo(source) ? FSkin.Colors.CLR_ACTIVE : FSkin.Colors.CLR_INACTIVE;
             panel.setBorder(new FSkin.LineSkinBorder(FSkin.getColor(brdrColor), 2));
@@ -453,7 +455,7 @@ public class VAssignCombatDamage {
             }
         } else {
             lethalDamage = Math.max(0, card.getLethalDamage());
-            if (card.getCurrentState().getType().isPlaneswalker()) {
+            if (card.getCurrentState().isPlaneswalker()) {
                 lethalDamage = Integer.valueOf(card.getCurrentState().getLoyalty());
             } else if (attackerHasDeathtouch) {
                 lethalDamage = Math.min(lethalDamage, 1);