Make the some method null-safe for Options.

Scalastyle would fail the null without an override, and Option already contains that logic. I can remove the sideEffectNone call and use if-else syntax if that's clearer.