Uses REGEX to identify uuids instead of exceptions
Merge pull request #1196 from lukecampbell/pubsub-fix

Uses REGEX to identify uuids instead of exceptions