diff --git a/org.adempiere.base/src/org/idempiere/process/MoveClient.java b/org.adempiere.base/src/org/idempiere/process/MoveClient.java
index c508e885a7..5d03f87d3e 100644
--- a/org.adempiere.base/src/org/idempiere/process/MoveClient.java
+++ b/org.adempiere.base/src/org/idempiere/process/MoveClient.java
@@ -1005,8 +1005,10 @@ public class MoveClient extends SvrProcess {
 										|| ("M_CostType".equalsIgnoreCase(tableName) && "Name".equalsIgnoreCase(columnName))
 										|| ("R_RequestProcessor".equalsIgnoreCase(tableName) && "Name".equalsIgnoreCase(columnName))
 										) {
-									String value = parameters[i].toString();
-									parameters[i] = value.replaceFirst(oldClientValue, p_ClientValue);
+									if (parameters[i] != null) {
+										String value = parameters[i].toString();
+										parameters[i] = value.replaceFirst(oldClientValue, p_ClientValue);
+									}
 								}
 							}
 						}