another test fix avoiding NPE on queue
Merge pull request #920 from clebertsuconic/Branch_2_2_EAP

another test fix avoiding NPE on queue