Added a wait and check method so that 'stopping' monitor threads is quicker.