Fix error messages
Merging origin/skhan/master-pending-AutomationForCurrencyLocalization into master