Attempted fix for NPE for uuid.