Fix NPE when loading locale
Merge pull request #581 from Meldanor/master

Fix crash on startup due a NPE