Always return nil for undefined options (#2308)