diff --git a/forge-core/src/main/java/forge/util/lang/LangEnglish.java b/forge-core/src/main/java/forge/util/lang/LangEnglish.java
index 76dbbe52039..cadaab00464 100644
--- a/forge-core/src/main/java/forge/util/lang/LangEnglish.java
+++ b/forge-core/src/main/java/forge/util/lang/LangEnglish.java
@@ -32,6 +32,10 @@ public class LangEnglish extends Lang {
 
     @Override
     public String getNickName(final String name) {
-        return name.split(" ")[0].replace(",", "");
+        if (name.contains(",")) {
+            return name.split(",")[0];
+        } else {
+            return name.split(" ")[0];
+        }
     }
 }
diff --git a/forge-core/src/main/java/forge/util/lang/LangGerman.java b/forge-core/src/main/java/forge/util/lang/LangGerman.java
index 86f1bce937d..3c9d6dc1674 100644
--- a/forge-core/src/main/java/forge/util/lang/LangGerman.java
+++ b/forge-core/src/main/java/forge/util/lang/LangGerman.java
@@ -29,7 +29,11 @@ public class LangGerman extends Lang {
 
     @Override
     public String getNickName(final String name) {
-        return name.split(" ")[0].replace(",", "");
+        if (name.contains(",")) {
+            return name.split(",")[0];
+        } else {
+            return name.split(" ")[0];
+        }
     }
 
 }
diff --git a/forge-core/src/main/java/forge/util/lang/LangItalian.java b/forge-core/src/main/java/forge/util/lang/LangItalian.java
index 47fddb1d195..248ea7432f5 100644
--- a/forge-core/src/main/java/forge/util/lang/LangItalian.java
+++ b/forge-core/src/main/java/forge/util/lang/LangItalian.java
@@ -25,7 +25,11 @@ public class LangItalian extends Lang {
 
     @Override
     public String getNickName(final String name) {
-        return name.split(" ")[0].replace(",", "");
+        if (name.contains(",")) {
+            return name.split(",")[0];
+        } else {
+            return name.split(" ")[0];
+        }
     }
 
 }
diff --git a/forge-core/src/main/java/forge/util/lang/LangSpanish.java b/forge-core/src/main/java/forge/util/lang/LangSpanish.java
index 45d5b6d7791..55ef9db156e 100644
--- a/forge-core/src/main/java/forge/util/lang/LangSpanish.java
+++ b/forge-core/src/main/java/forge/util/lang/LangSpanish.java
@@ -27,7 +27,11 @@ public class LangSpanish extends Lang {
 
     @Override
     public String getNickName(final String name) {
-        return name.split(" ")[0].replace(",", "");
+        if (name.contains(",")) {
+            return name.split(",")[0];
+        } else {
+            return name.split(" ")[0];
+        }
     }
 
 }