Improved existence check