Ammended my fix for #115

Instead of moving bailout code, added condition on list length, to prevent unpacking of empty list.