diff --git a/src/card/Card.java b/src/card/Card.java
index f772d66..dfd3646 100644
--- a/src/card/Card.java
+++ b/src/card/Card.java
@@ -113,6 +113,7 @@
 	
 	private JSONArray cardInfosToJson(){
 		JSONArray infoArray = new JSONArray();
+		if(cardInfos == null) return infoArray;
 		for(CardInfo ci : cardInfos){
 			infoArray.put(ci.toJson());
 		}