NULL change
Merge pull request #1539 from zz9pzza/issue_3926

NULL change