Ensure required handlers are always restarted