fixed crash in watch checking code