Merge "Change the error message for orchestrator startup"