add unlikely to error handling
2 files changed