The case-class implementation of `unapply` checks for `null` and returns `None`. I updated the `unapply` method so we're consistent.