Coverity 1100843: remove unnecessary check
Coverity 1100842: add missing return statement
Improve 'host-mode' info message
Revert change in queue handler wait logic. Bug #988.