handle NULL option
Merge pull request #203 from sbillard/master

handle NULL option