ENHANCED: #19 Proper handling of deleted queues.