Guard against nil options while merging

Addresses #1