Fix nil problem caused by last commit.