Add a better check for whether the bucket exists