Bug 1035062 - Implement TargetHandlersManager +shepherd

Can we just return null here?