Only create organizer if one exists
v 0.3.5