Cleanup and now detecting one more type of build failure.