Update error types and definition to allow passing along of basic error