wip

skyrim-multiplayer · Jan 30, 2025 · a739cde · a739cde
1 parent b68ec67
commit a739cde
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/papyrus-vm/src/papyrus-vm-lib/ActivePexInstance.cpp b/papyrus-vm/src/papyrus-vm-lib/ActivePexInstance.cpp
@@ -449,8 +449,24 @@ void ActivePexInstance::ExecuteOpCode(
               spdlog::trace("propget do nothing: prop {} not found",
                             propertyName);
             } else {
-              VarValue* var = inst->variables->GetVariableByName(
-                it->autoVarName.data(), *inst->sourcePex.fn());
+
+              VarValue* var;
+
+              try {
+                var = inst->variables->GetVariableByName(
+                  it->autoVarName.data(), *inst->sourcePex.fn());
+
+              } catch (std::exception& e) {
+                spdlog::error("OpcodesImplementation::Opcodes::op_PropGet - "
+                              "GetVariableByName errored with '{}'",
+                              e.what());
+                var = nullptr;
+              } catch (...) {
+                spdlog::error("OpcodesImplementation::Opcodes::op_PropGet - "
+                              "GetVariableByName errored with unknown error");
+                var = nullptr;
+              }
+
               if (var) {
                 *args[2] = *var;
               } else {