Moved _patch_error
Merge branch 'ccleanup' into testccleanup