Fix clop threads hitting exception