Add null check and cache bust