Complete the work from the last error handling commit.