diff --git a/org.adempiere.base/src/org/compiere/util/Language.java b/org.adempiere.base/src/org/compiere/util/Language.java
index 184e9929da..f6ee6a328f 100644
--- a/org.adempiere.base/src/org/compiere/util/Language.java
+++ b/org.adempiere.base/src/org/compiere/util/Language.java
@@ -141,7 +141,8 @@ public class Language implements Serializable
 				if (dblang != null) {
 					if (!(   language.equals(dblang.getLanguageISO()) 
 						  && country.equals(dblang.getCountryCode())
-						 )
+						 ) && dblang.getLanguageISO() != null
+						   && dblang.getCountryCode() != null
 						) {
 						locale = new Locale(dblang.getLanguageISO(), dblang.getCountryCode());
 					}