Added check for uuid based on #98