Fixed situations where unopened buckets won't be handed off.