Removed exception throwing, and more message externalization.