Fixed: NullPointException in the localised methods