diff --git a/src/system/kernel/util/Bitmap.cpp b/src/system/kernel/util/Bitmap.cpp
index 8f47c95e19..4844abb1a1 100644
--- a/src/system/kernel/util/Bitmap.cpp
+++ b/src/system/kernel/util/Bitmap.cpp
@@ -32,10 +32,10 @@ Bitmap::Bitmap(int bitCount)
 	if (fBits == NULL) {
 		fSize = 0;
 		fInitStatus = B_NO_MEMORY;
+	} else {
+		fElementsCount = count;
+		memset(fBits, 0, sizeof(addr_t) * count);
 	}
-
-	fElementsCount = count;
-	memset(fBits, 0, sizeof(addr_t) * count);
 }