Properly handle missing queues