Avoid NPE's and Improved locale presentation