Hopefully fixed null issue.