Improved early return