diff --git a/src/main/java/infinitespire/quests/PickUpCardQuest.java b/src/main/java/infinitespire/quests/PickUpCardQuest.java
index 4853eb2..1dfab01 100644
--- a/src/main/java/infinitespire/quests/PickUpCardQuest.java
+++ b/src/main/java/infinitespire/quests/PickUpCardQuest.java
@@ -52,7 +52,7 @@ public Texture getTexture() {
 		}
 
 		if(c != null) {
-			switch (CardLibrary.getCard(this.cardID).type) {
+			switch (c.type) {
 				case ATTACK:
 					texture = InfiniteSpire.getTexture("img/infinitespire/ui/questLog/questIcons/card-attack.png");
 					break;
@@ -105,8 +105,8 @@ public String getRewardString() {
 
 	@Override
 	public String getTitle() {
-
-		return questStrings.TEXT[10] + CardLibrary.cards.get(cardID).name;
+		AbstractCard rCard = CardLibrary.getCard(this.cardID);
+		return questStrings.TEXT[10] + (rCard != null ? rCard.name : "");
 	}
 
 	@Override