Fixed the null collections issue.