Fixed null issue.