Minor refactoring + log the burial of a NPE
Add missing english translations (log file hygiene)
Merge remote-tracking branch 'origin/master'