From 2da0a3e95f2f624fde96bb3924686db2df201d2d Mon Sep 17 00:00:00 2001
From: Thierry Crozat <criezy@scummvm.org>
Date: Sun, 21 Feb 2021 17:05:37 +0000
Subject: [PATCH] GRIM: Fix unknown key error when loading savegame

---
 engines/grim/pool.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/engines/grim/pool.h b/engines/grim/pool.h
index 1d19e82faea..72d10f68922 100644
--- a/engines/grim/pool.h
+++ b/engines/grim/pool.h
@@ -314,9 +314,10 @@ void PoolObject<T>::Pool::restoreObjects(SaveGame *state) {
 	Common::HashMap<int32, T *> tempMap;
 	for (int32 i = 0; i < size; ++i) {
 		int32 id = state->readLESint32();
-		T *t = _map.getVal(id);
-		_map.erase(id);
-		if (!t) {
+		T *t = nullptr;
+		if (_map.tryGetVal(id, t))
+			_map.erase(id);
+		else {
 			t = new T();
 			t->setId(id);
 		}