* Fixed to use typed errors instead of strings.Contains on error messages