diff --git a/src/nostalgia/core/gba/panic.cpp b/src/nostalgia/core/gba/panic.cpp
index c12119de..af4268a9 100644
--- a/src/nostalgia/core/gba/panic.cpp
+++ b/src/nostalgia/core/gba/panic.cpp
@@ -26,7 +26,7 @@ void panic(const char*, int, const char *msg, ox::Error err) {
 	REG_DISPCTL = DispCtl_Bg0;
 	clearTileLayer(nullptr, 0);
 	ox::BString<23> serr = "Error code: ";
-	serr += err;
+	serr += static_cast<int64_t>(err);
 	puts(nullptr, 32 + 1,  1, "SADNESS...");
 	puts(nullptr, 32 + 1,  4, "UNEXPECTED STATE:");
 	puts(nullptr, 32 + 2,  6, msg);
diff --git a/src/nostalgia/studio/json_test.cpp b/src/nostalgia/studio/json_test.cpp
index a9e6b8d5..3c71ec50 100644
--- a/src/nostalgia/studio/json_test.cpp
+++ b/src/nostalgia/studio/json_test.cpp
@@ -24,11 +24,11 @@ struct TestStructNest {
 template<typename T>
 Error model(T *io, TestStructNest *obj) {
 	auto err = OxError(0);
-	err |= io->setTypeInfo("TestStructNest", 4);
-	err |= io->field("Bool", &obj->Bool);
-	err |= io->field("Int", &obj->Int);
-	err |= io->field("Double", &obj->Double);
-	err |= io->field("String", &obj->String);
+	oxReturnError(io->setTypeInfo("TestStructNest", 4));
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->field("Double", &obj->Double));
+	oxReturnError(io->field("String", &obj->String));
 	return err;
 }
 
@@ -43,12 +43,12 @@ struct TestStruct {
 template<typename T>
 Error model(T *io, TestStruct *obj) {
 	auto err = OxError(0);
-	err |= io->setTypeInfo("TestStruct", 5);
-	err |= io->field("Bool", &obj->Bool);
-	err |= io->field("Int", &obj->Int);
-	err |= io->field("Double", &obj->Double);
-	err |= io->field("String", &obj->String);
-	err |= io->field("Struct", &obj->Struct);
+	oxReturnError(io->setTypeInfo("TestStruct", 5));
+	oxReturnError(io->field("Bool", &obj->Bool));
+	oxReturnError(io->field("Int", &obj->Int));
+	oxReturnError(io->field("Double", &obj->Double));
+	oxReturnError(io->field("String", &obj->String));
+	oxReturnError(io->field("Struct", &obj->Struct));
 	return err;
 }
 
@@ -68,8 +68,8 @@ int main() {
 		}
 	};
 	TestStruct tsOut;
-	err |= writeJson(&json, &ts);
-	err |= readJson(json, &tsOut);
+	oxReturnError(writeJson(&json, &ts));
+	oxReturnError(readJson(json, &tsOut));
 
 	cout << tsOut.Bool << endl;
 	cout << tsOut.Int << endl;
diff --git a/src/nostalgia/studio/mainwindow.cpp b/src/nostalgia/studio/mainwindow.cpp
index 7310d2ea..8b253581 100644
--- a/src/nostalgia/studio/mainwindow.cpp
+++ b/src/nostalgia/studio/mainwindow.cpp
@@ -247,7 +247,7 @@ int MainWindow::readState() {
 	restoreGeometry(settings.value("geometry").toByteArray());
 	restoreState(settings.value("windowState").toByteArray());
 	auto json = settings.value("json").toString();
-	err |= readJson(json, &m_state);
+	oxReturnError(readJson(json, &m_state));
 	settings.endGroup();
 
 	openProject(m_state.projectPath);
@@ -258,7 +258,7 @@ int MainWindow::readState() {
 void MainWindow::writeState() {
 	// generate JSON for application specific state info
 	QString json;
-	writeJson(&json, &m_state);
+	oxIgnoreError(writeJson(&json, &m_state));
 
 	QSettings settings(m_profile.orgName, m_profile.appName);
 	settings.beginGroup("MainWindow");
diff --git a/src/nostalgia/studio/mainwindow.hpp b/src/nostalgia/studio/mainwindow.hpp
index d3a1a08e..dcad1358 100644
--- a/src/nostalgia/studio/mainwindow.hpp
+++ b/src/nostalgia/studio/mainwindow.hpp
@@ -53,7 +53,7 @@ struct NostalgiaStudioProfile {
 template<typename T>
 ox::Error model(T *io, NostalgiaStudioProfile *obj) {
 	auto err = OxError(0);
-	io->setTypeInfo("NostalgiaStudioProfile", 3);
+	oxReturnError(io->setTypeInfo("NostalgiaStudioProfile", 3));
 	oxReturnError(io->field("app_name", &obj->appName));
 	oxReturnError(io->field("org_name", &obj->orgName));
 	oxReturnError(io->field("plugins_path", &obj->pluginsPath));
diff --git a/src/nostalgia/studio/oxfstreeview.cpp b/src/nostalgia/studio/oxfstreeview.cpp
index 22f19e12..bb0bc2bf 100644
--- a/src/nostalgia/studio/oxfstreeview.cpp
+++ b/src/nostalgia/studio/oxfstreeview.cpp
@@ -28,12 +28,12 @@ OxFSFile::OxFSFile(PassThroughFS *fs, QString path, OxFSFile *parentItem) {
 		auto stat = fs->stat(static_cast<const char*>(m_path.toUtf8()));
 		if (!stat.error) {
 			if (stat.value.fileType == FileType_Directory) {
-				fs->ls(m_path.toUtf8(), [&ls](const char *name, ox::InodeId_t) {
+				oxThrowError(fs->ls(m_path.toUtf8(), [&ls](const char *name, ox::InodeId_t) {
 					if (name[0] != '.') {
 						ls.push_back(name);
 					}
 					return OxError(0);
-				});
+				}));
 				std::sort(ls.begin(), ls.end());
 			}
 			auto p = m_path;