diff --git a/cpu.cpp b/cpu.cpp
index f234971..db28786 100644
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -1084,8 +1084,6 @@ bool cpu::misc_operations(const uint16_t instr)
 
 void cpu::busError()
 {
-	fprintf(stderr, "BUS ERROR\n");
-
 	trap(4);
 }
 
@@ -1097,7 +1095,7 @@ void cpu::trap(const uint16_t vector)
 	setPSW(b->readWord(vector + 2));
 	setPC (b->readWord(vector + 0));
 
-	fprintf(stderr, "TRAP %o: PC is now %06o\n", vector, getPC());
+	D(fprintf(stderr, "TRAP %o: PC is now %06o\n", vector, getPC());)
 }
 
 std::pair<std::string, int> cpu::addressing_to_string(const uint8_t mode_register, const uint16_t pc)