fixed a null issue.