Handle empty queues better