diff --git a/client/src/org/compiere/apps/APanel.java b/client/src/org/compiere/apps/APanel.java
index 4bb118e072..3363265c0f 100644
--- a/client/src/org/compiere/apps/APanel.java
+++ b/client/src/org/compiere/apps/APanel.java
@@ -1868,7 +1868,8 @@ public final class APanel extends CPanel
 			} else {
 				final int id = m_curTab.getKeyID(i);
 				String value = DB.getSQLValueStringEx(null, sql, id);
-				value = value.replace(" - ", " | ");
+				if (value != null)
+					value = value.replace(" - ", " | ");
 				displayValue.append(value);
 				// Append ID
 				if (displayValue.length() == 0 || CLogMgt.isLevelFine())
diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
index a3ca491147..c2eaf05207 100644
--- a/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
+++ b/zkwebui/WEB-INF/src/org/adempiere/webui/panel/AbstractADWindowPanel.java
@@ -1448,7 +1448,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
 			} else {
 				final int id = curTab.getKeyID(i);
 				String value = DB.getSQLValueStringEx(null, sql, id);
-				value = value.replace(" - ", " | ");
+				if (value != null)
+					value = value.replace(" - ", " | ");
 				displayValue.append(value);
 				// Append ID
 				if (displayValue.length() == 0 || CLogMgt.isLevelFine())