mod. except clause too broad - pass on empty queue only.

Change-Id: Ibcd1ee38fbae1b9a23dbd28445f2ae21f83fb95d