NullPointerException Fix
PL locale update