* Add optional supervisor disable. Used `DisableSupervisor` so that default can be enabled and it can be disabled explicity. But, open to defaulting to disable (i. e. change param to `EnableSupervisor`). * Move nil check to call site