Code update for possible empty version.