diff --git a/src/debug/debug.cpp b/src/debug/debug.cpp
index b6cbc61b..f93b2985 100644
--- a/src/debug/debug.cpp
+++ b/src/debug/debug.cpp
@@ -448,7 +448,7 @@ bool CBreakpoint::CheckBreakpoint(Bitu seg, Bitu off)
 // Checks if breakpoint is valid and should stop execution
 {
 	// Quick exit if there are no breakpoints
-	if (BPoints.size() == 0) return false;
+	if (BPoints.empty()) return false;
 
 	// Search matching breakpoint
 	std::list<CBreakpoint*>::iterator i;
@@ -508,6 +508,8 @@ bool CBreakpoint::CheckBreakpoint(Bitu seg, Bitu off)
 bool CBreakpoint::CheckIntBreakpoint(PhysPt adr, Bit8u intNr, Bit16u ahValue, Bit16u alValue)
 // Checks if interrupt breakpoint is valid and should stop execution
 {
+	if (BPoints.empty()) return false;
+
 	// Search matching breakpoint
 	std::list<CBreakpoint*>::iterator i;
 	CBreakpoint* bp;