Only handle queue end if queue is actually empty

Only handle queue end if queue is actually empty #1939