Reconstruct org code and try error control