Merge "Switch to exceptions for most cp calls"