better QueueNotFoundException handling

fixes #1669