Check that more tokens are available

Neil Drummrequested to merge
issue/potx-3563293:3563293-infinite-loop-in into 7.x-3.x

Closes #3563293

Merge request reports