another test fix avoiding NPE on queue
Merge pull request #922 from clebertsuconic/Branch_2_2_AS7

another test fix avoiding NPE on queue