fix(DaedaluScript): add more better error handling

GothicKit · Jan 26, 2025 · 7ca8863 · 7ca8863
1 parent 0887eb1
commit 7ca8863
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/DaedalusScript.cc b/src/DaedalusScript.cc
@@ -3,6 +3,7 @@
 #include "zenkit-capi/DaedalusScript.h"
 #include "Internal.hh"
 
+#include <exception>
 #include <zenkit/addon/daedalus.hh>
 
 ZKC_LOADER(ZkDaedalusScript)
@@ -106,8 +107,9 @@ ZkDaedalusInstance* ZkDaedalusSymbol_getInstance(ZkDaedalusSymbol* slf) {
 
 	try {
 		auto& instance = slf->get_instance();
+		if (instance == nullptr) return nullptr;
 		return new ZkDaedalusInstance(instance);
-	} catch (std::runtime_error& e) {
+	} catch (std::exception& e) {
 		return nullptr;
 	}
 }
@@ -193,6 +195,9 @@ ZkDaedalusDataType ZkDaedalusSymbol_getReturnType(ZkDaedalusSymbol const* slf) {
 }
 
 ZKC_API ZkDaedalusInstanceType ZkDaedalusInstance_getType(ZkDaedalusInstance const* slf) {
+	ZKC_TRACE_FN();
+	ZKC_CHECK_NULL(slf);
+
 	auto type = SLF->instance_type();
 
 	if (type == &typeid(zenkit::IGuildValues)) return ZkDaedalusInstanceType_GuildValues;