Fix NullPointerException on locale change