diff --git a/res/cards.txt b/res/cards.txt
index e4ea9dee1a3..7e0269d8f70 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -319,7 +319,7 @@ Drowned Catacomb
 no cost
 Land
 no text
-CARDNAME enters the battlefield tapped unless you control an Island or a Swamp.
+CARDNAME enters the battlefield tapped unless you control a Island or a Swamp.
 tap: add U
 tap: add B
 
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 640436dbd17..5640d0f2a71 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -204,12 +204,18 @@ public class CardFactory implements NewConstants {
                 }
             });
         }//if "Comes into play tapped."
-        if (hasKeyword(card, "CARDNAME enters the battlefield tapped unless you control a ") != -1)
+        if (hasKeyword(card, "CARDNAME enters the battlefield tapped unless you control") != -1)
         {
-        	int n = hasKeyword(card, "CARDNAME enters the battlefield tapped unless you control a ");
+        	int n = hasKeyword(card, "CARDNAME enters the battlefield tapped unless you control");
         	String parse = card.getKeyword().get(n).toString();
         	
-        	final String types[] = parse.substring(60, parse.length() - 1).split(" or a ");
+        	String splitString;
+        	if (parse.contains(" or a "))
+        		splitString = " or a ";
+        	else
+        		splitString = " or an ";
+        	
+        	final String types[] = parse.substring(60, parse.length() - 1).split(splitString);
         	
         	card.addComesIntoPlayCommand(new Command()
         	{
diff --git a/src/forge/Gui_WinLose.java b/src/forge/Gui_WinLose.java
index b38cbe69266..14f7144a1cf 100644
--- a/src/forge/Gui_WinLose.java
+++ b/src/forge/Gui_WinLose.java
@@ -203,6 +203,11 @@ public class Gui_WinLose extends JFrame {
             	JOptionPane.showMessageDialog(null, "You have earned " + creds + " credits.");
             	
             }
+            else
+            {
+            	quest.subtractCredits(15);
+            	JOptionPane.showMessageDialog(null, "You FAIL! You have lost 15 credits.");
+            }
             
             winLose.reset();
             
diff --git a/src/forge/QuestData.java b/src/forge/QuestData.java
index 683c3539136..e9533ea3467 100644
--- a/src/forge/QuestData.java
+++ b/src/forge/QuestData.java
@@ -484,6 +484,8 @@ public class QuestData implements NewConstants {
     public void subtractCredits(long c)
     {
     	credits-=c;
+    	if (credits < 0)
+    		credits = 0;
     }
     
     public long getCredits() {