diff --git a/OSBindings/Mac/Clock SignalTests/MSXStaticAnalyserTests.mm b/OSBindings/Mac/Clock SignalTests/MSXStaticAnalyserTests.mm
index 2e092d2f2..7a438dc50 100644
--- a/OSBindings/Mac/Clock SignalTests/MSXStaticAnalyserTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/MSXStaticAnalyserTests.mm	
@@ -220,7 +220,10 @@ static NSDictionary<NSString *, MSXROMRecord *> *romRecordsBySHA1 = @{
 		}
 
 		// assert equality
-		XCTAssert(targets.front().msx.paging_model == romRecord.cartridgeType, @"%@; should be %d, is %d", testFile, romRecord.cartridgeType, targets.front().msx.paging_model);
+		XCTAssert(!targets.empty(), "%@ should be recognised as an MSX file");
+		if(!targets.empty()) {
+			XCTAssert(targets.front().msx.paging_model == romRecord.cartridgeType, @"%@; should be %d, is %d", testFile, romRecord.cartridgeType, targets.front().msx.paging_model);
+		}
 	}
 }
 
diff --git a/StaticAnalyser/StaticAnalyser.hpp b/StaticAnalyser/StaticAnalyser.hpp
index 3c13ef5fe..88dbb2aa7 100644
--- a/StaticAnalyser/StaticAnalyser.hpp
+++ b/StaticAnalyser/StaticAnalyser.hpp
@@ -46,7 +46,6 @@ enum class MSXCartridgeType {
 	KonamiWithSCC,
 	ASCII8kb,
 	ASCII16kb,
-	RType,
 	FMPac
 };