Chore: Use a more direct and less error-prone return value (#4008)

Chore: Use a more direct and less error-prone return value (#4008) #2929