Use guard value for none instead of for Some(null)

that makes the more frequently used constructor some(x) a noop