Ensure we always propagate the right return value