Added size==0 sanity check, but that check stops Nico's tests cold... Time to fix it