More removal of error suppression usage
2 files changed