Add null check
Don't create new resolver each time