diff --git a/Mage.Sets/src/mage/cards/d/DranaAndLinvala.java b/Mage.Sets/src/mage/cards/d/DranaAndLinvala.java
index 340bfefe3b9..98f769b7a10 100644
--- a/Mage.Sets/src/mage/cards/d/DranaAndLinvala.java
+++ b/Mage.Sets/src/mage/cards/d/DranaAndLinvala.java
@@ -124,7 +124,9 @@ class DranaAndLinvalaGainAbilitiesEffect extends ContinuousEffectImpl {
                         || ability.getAbilityType() == AbilityType.MANA)
                 .collect(Collectors.toList())) {
             Ability addedAbility = perm.addAbility(ability, source.getSourceId(), game);
-            addedAbility.getEffects().setValue("dranaLinvalaFlag", true);
+            if (addedAbility != null) {
+                addedAbility.getEffects().setValue("dranaLinvalaFlag", true);
+            }
         }
         return true;
     }
diff --git a/Mage/src/main/java/mage/game/permanent/Permanent.java b/Mage/src/main/java/mage/game/permanent/Permanent.java
index c7902d412f4..1223235e5c7 100644
--- a/Mage/src/main/java/mage/game/permanent/Permanent.java
+++ b/Mage/src/main/java/mage/game/permanent/Permanent.java
@@ -211,6 +211,7 @@ public interface Permanent extends Card, Controllable {
      * @param ability
      * @param sourceId
      * @param game
+     * @return can be null for exists abilities
      */
     Ability addAbility(Ability ability, UUID sourceId, Game game);