From 17d84c59254370f34f8c20dc3eeb111260d4c309 Mon Sep 17 00:00:00 2001
From: Nuno <ulukyn@gmail.com>
Date: Tue, 22 Dec 2020 14:45:31 +0100
Subject: [PATCH] Merge branch 'fixes'

---
 ryzom/server/src/ai_service/script_vm.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ryzom/server/src/ai_service/script_vm.cpp b/ryzom/server/src/ai_service/script_vm.cpp
index 69c9ef908..33744c76a 100644
--- a/ryzom/server/src/ai_service/script_vm.cpp
+++ b/ryzom/server/src/ai_service/script_vm.cpp
@@ -870,13 +870,13 @@ void CScriptVM::interpretCode(
 				{
 					otherContext = callerContext;
 				}
-				else
+				else if (thisContext != NULL)
 				{
 					otherContext = thisContext->findContext(strId);
 				}
 				if (!otherContext)
 					nlinfo("Group %s unknown, pushing a NULL context on the stack, this may lead to bad behaviours", CStringMapper::unmap(strId).c_str());
-				
+
 				stack.push(otherContext);
 				index+=2;
 			}