Take into account new way to report errors