Make return behavior consistent with other functions