diff --git a/src/ai/ai_core.cpp b/src/ai/ai_core.cpp index c5813e4148..5c466c81ab 100644 --- a/src/ai/ai_core.cpp +++ b/src/ai/ai_core.cpp @@ -283,14 +283,18 @@ { if (!_networking || _network_server) { Company *c = Company::GetIfValid(company); - assert(c != nullptr && c->ai_instance != nullptr); + assert(c != nullptr); - Backup cur_company(_current_company, company, FILE_LINE); - c->ai_instance->Save(); - cur_company.Restore(); - } else { - AIInstance::SaveEmpty(); + /* When doing emergency saving, an AI can be not fully initialised. */ + if (c->ai_instance != nullptr) { + Backup cur_company(_current_company, company, FILE_LINE); + c->ai_instance->Save(); + cur_company.Restore(); + return; + } } + + AIInstance::SaveEmpty(); } /* static */ std::string AI::GetConsoleList(bool newest_only)