Fixes to pass through errors when processing Credit Cards