Index: lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java =================================================================== diff -u -r4f6235f53dbd594d4ccfbad02bca53f3b598336c -r12c8fb2a9d17f5e0483664b0e06b5ef6439c8687 --- lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java (.../LanguageUtil.java) (revision 4f6235f53dbd594d4ccfbad02bca53f3b598336c) +++ lams_common/src/java/org/lamsfoundation/lams/util/LanguageUtil.java (.../LanguageUtil.java) (revision 12c8fb2a9d17f5e0483664b0e06b5ef6439c8687) @@ -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);