FIX Fixed race-condition with teardown of the universe.