Improving the downstream error handling from FirstData, based on a few additional cases