Use option to avoid NPE in test.
Merge pull request #1 from fnothaft/fix-oc-npe

Use option to avoid NPE in test.