diff --git a/src/kits/app/Message.cpp b/src/kits/app/Message.cpp
index a111a294bf..b4a411f34b 100644
--- a/src/kits/app/Message.cpp
+++ b/src/kits/app/Message.cpp
@@ -165,8 +165,9 @@ BMessage::BMessage(BMessage* other)
 BMessage::BMessage(uint32 _what)
 {
 	DEBUG_FUNCTION_ENTER;
-	_InitCommon(true);
-	fHeader->what = what = _what;
+	if (_InitCommon(true))
+		fHeader->what = _what;
+	what = _what;
 }