BLXX-81 validate before adding to queue