Fixed null parameter handling
Merge pull request #1 from v6024i/master

Fixed null parameter handling