Should there be a `return null;` statement here to catch features that don't match?