Index: lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java =================================================================== diff -u -reb06cf9300f02897c13bd577689deacb2cf4b5fc -r9ba6bf0c302b06f8f8f7be51667054e680ad1e52 --- lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java (.../LoginRequestServlet.java) (revision eb06cf9300f02897c13bd577689deacb2cf4b5fc) +++ lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java (.../LoginRequestServlet.java) (revision 9ba6bf0c302b06f8f8f7be51667054e680ad1e52) @@ -111,7 +111,7 @@ } } - String[] localeParts = langIsoCode.split("_"); + String[] localeParts = langIsoCode == null ? new String[0] : langIsoCode.split("_"); // if langIsoCode is just 2 letters, then countryIsoCode stays the same and country will fall back to default // if langIsoCode is en_AU, then it gets split to langIsoCode and countryIsoCode // and the old value of countryIsoCode is considered country