Fixed leading or trailing whitespace in UUID field causing UUID to be invalidated