Moved the UUID creation to on success!