From 6e71ada28084208ddd3c09d4cd2155728c6b96ac Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 30 Dec 2023 13:57:51 -0600
Subject: [PATCH] [ox/claw] Improve error clarity when loading ModelObjects

(synced from bd2aeee276b7560e1f76cf4cb9345e5c2c646125)
---
 src/ox/claw/read.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/ox/claw/read.cpp b/src/ox/claw/read.cpp
index 3d2d834a9..e62c7e877 100644
--- a/src/ox/claw/read.cpp
+++ b/src/ox/claw/read.cpp
@@ -74,7 +74,10 @@ Result<Buffer> stripClawHeader(const ox::Buffer &buff) noexcept {
 
 Result<ModelObject> readClaw(TypeStore &ts, const char *buff, std::size_t buffSz) noexcept {
 	oxRequire(header, readClawHeader(buff, buffSz));
-	oxRequire(t, ts.getLoad(header.typeName, header.typeVersion, header.typeParams));
+	auto const [t, tdErr] = ts.getLoad(header.typeName, header.typeVersion, header.typeParams);
+	if (tdErr) {
+		return OxError(3, "Could not load type descriptor");
+	}
 	ModelObject obj;
 	oxReturnError(obj.setType(t));
 	switch (header.fmt) {