Merge "Fixed crash when UUID string is empty"