Fix a NPE introduced by the previous commit

We should probably get in the habit of converting all Map options to
Options as soon as they come in, and only deal with Options
internally. It prevents a lot of the default and null checking we have
to do otherwise.