Altered the way the persistence component used uuid so that error cases
work correctly