Index: lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java,v
diff -u -r1.7 -r1.8
--- lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	21 Sep 2007 03:34:24 -0000	1.7
+++ lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java	5 Nov 2007 01:15:10 -0000	1.8
@@ -145,7 +145,9 @@
 			properties.put("languageIsoCode", langIsoCode);
 		}else if(countryIsoCode.trim().length()>0){
 			properties.put("countryIsoCode", countryIsoCode);
-		}
+		}else{
+			return getDefaultLocale();
+		}		
 		List list = getService().findByProperties(SupportedLocale.class, properties);
 		if(list!=null && list.size()>0){
 			Collections.sort(list);