Organization Working Groups can have null entries that break consumers

Same as title, a recent update changed the Java API and the working group output for organizations is returning null values mixed in with the actual results. This causes breaks in the portal UI and should be resolved.