Reordered logic for samples if None

Now no copies of array created unnecessarily