Safer opperations in c2ctool