Minor FeatureNotImplementedException refactor.