Safer 'on queue completion' logic.