Fixed nasty datawatcher bug which 'randomly' crashes the client