diff --git a/forge-core/src/main/java/forge/util/TextUtil.java b/forge-core/src/main/java/forge/util/TextUtil.java
index 7e25ca44841..4c01cb215aa 100644
--- a/forge-core/src/main/java/forge/util/TextUtil.java
+++ b/forge-core/src/main/java/forge/util/TextUtil.java
@@ -269,6 +269,9 @@ public class TextUtil {
 
     //fast Replace
     public static String fastReplace( String str, String target, String replacement ) {
+        if (str == null) {
+            return null;
+        }
         int targetLength = target.length();
         if( targetLength == 0 ) {
             return str;