Better error checking in cycle-machines.