Fixed: don't expect options object to always exist.