Remove race condition potential from 'exists' use