Merge remote-tracking branch 'rodms/cp-error'