null watchlist bug fix