Additional checks to allow unpacking empty sets