Add not null options and fix small typo