Original code assumed that all string objects in the format of a UUID we...

We upgraded to the latest version and our code failed because we store an ID which looks like a UUID, but is text. Can you review the changes and if ok, please merge into master? Thanks, Dan