Improved error handling and added a couple missing localization strings.