Update error handling part.