Hotfix - don't map over null object