Guard against null being explicitly passed to `opt`
Merge pull request #6 from wombleton/master

Guard against null being explicitly passed to opt