diff --git a/.gitattributes b/.gitattributes
index 10f0a7d3b88..a043ff97c7c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7546,6 +7546,7 @@ res/cardsfolder/o/ocular_halo.txt svneol=native#text/plain
 res/cardsfolder/o/oculus.txt svneol=native#text/plain
 res/cardsfolder/o/odds_ends.txt -text
 res/cardsfolder/o/odious_trow.txt svneol=native#text/plain
+res/cardsfolder/o/odric_master_tactician.txt -text
 res/cardsfolder/o/odylic_wraith.txt svneol=native#text/plain
 res/cardsfolder/o/off_balance.txt svneol=native#text/plain
 res/cardsfolder/o/offalsnout.txt svneol=native#text/plain
diff --git a/res/cardsfolder/o/odric_master_tactician.txt b/res/cardsfolder/o/odric_master_tactician.txt
new file mode 100644
index 00000000000..d19ffd804c5
--- /dev/null
+++ b/res/cardsfolder/o/odric_master_tactician.txt
@@ -0,0 +1,12 @@
+Name:Odric, Master Tactician
+ManaCost:2 W W
+Types:Legendary Creature Human Soldier
+PT:3/4
+K:First Strike
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ OdricTest | SVarCompare$ GE3 | Execute$ TrigOdricEffect | TriggerDescription$ Whenever CARDNAME and at least three other creatures attack, you choose which creatures block this combat and how those creatures block.
+SVar:TrigOdricEffect:AB$ DeclareCombatants | Cost$ 0 | DeclareAttackers$ True | DeclareBlockers$ True
+SVar:OdricTest:Count$Valid Creature.attacking+Other
+SVar:RemAIDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/odric_master_tactician.jpg
+Oracle:First strike (This creature deals combat damage before creatures without first strike.)\nWhenever Odric, Master Tactician and at least three other creatures attack, you choose which creatures block this combat and how those creatures block.
+SetInfo:M13 Rare
\ No newline at end of file
diff --git a/src/main/java/forge/game/player/PlayerControllerHuman.java b/src/main/java/forge/game/player/PlayerControllerHuman.java
index 598154030b2..3f96d6f0791 100644
--- a/src/main/java/forge/game/player/PlayerControllerHuman.java
+++ b/src/main/java/forge/game/player/PlayerControllerHuman.java
@@ -550,8 +550,11 @@ public class PlayerControllerHuman extends PlayerController {
         for(SpellAbility sa : usableFromOpeningHand) {
             srcCards.add(sa.getSourceCard());
         }
+        List<SpellAbility> result = new ArrayList<SpellAbility>();
+        if (srcCards.isEmpty()) {
+            return result;
+        }
         List<Card> chosen = GuiChoose.order("Choose cards to activate from opening hand", "Activate first", -1, srcCards, null, null);
-        List<SpellAbility> result = new ArrayList<SpellAbility>(); 
         for(Card c : chosen) {
             for(SpellAbility sa : usableFromOpeningHand) {
                 if ( sa.getSourceCard() == c ) {