Remove helper function, properly bubble up errors