Fix broken locale
Do null checks to prevent NPE's