Add null check before adding fetcher