diff --git a/include/Nazara/Core/Bitset.inl b/include/Nazara/Core/Bitset.inl
index c8467c27e..e439dfc80 100644
--- a/include/Nazara/Core/Bitset.inl
+++ b/include/Nazara/Core/Bitset.inl
@@ -104,7 +104,8 @@ unsigned int NzBitset<Block, Allocator>::FindNext(unsigned int bit) const
 {
 	NazaraAssert(bit < m_bitCount, "Bit index out of range");
 
-	bit++;
+	if (++bit >= m_bitCount)
+		return npos;
 
 	// Le bloc du bit, l'indice du bit
 	unsigned int blockIndex = GetBlockIndex(bit);