Fixed the null issue.