diff --git a/src/main/java/forge/gui/match/controllers/CPicture.java b/src/main/java/forge/gui/match/controllers/CPicture.java
index 8c3dd28b81f..57bc92ca40e 100644
--- a/src/main/java/forge/gui/match/controllers/CPicture.java
+++ b/src/main/java/forge/gui/match/controllers/CPicture.java
@@ -93,20 +93,16 @@ public enum CPicture implements ICDoc {
         
         flipped = !flipped;
         
-        final CardCharacteristicName newState;
+        CardCharacteristicName newState = CardCharacteristicName.Original;
         if (flipped) {
             if (currentCard.isDoubleFaced()) {
                 newState = CardCharacteristicName.Transformed;
             } else if (currentCard.isFlipCard()) {
                 newState = CardCharacteristicName.Flipped;
-            } else {
-                throw new RuntimeException("unhandled flippable card");
             }
-        } else {
-            newState = CardCharacteristicName.Original;
         }
 
-        CardCharacteristicName oldState = currentCard.getCurState();
+        final CardCharacteristicName oldState = currentCard.getCurState();
         if (oldState != newState) { 
             currentCard.setState(newState);
         }