diff --git a/src/core/message.c b/src/core/message.c
index 75a890dd..d194701d 100644
--- a/src/core/message.c
+++ b/src/core/message.c
@@ -67,7 +67,7 @@ size_t msg_external_data_get_size()
 void msg_with_struct_init(message_t *msg, msg_type_e type, void *struct_ptr,
                           size_t struct_size)
 {
-    if (!(msg != NULL && struct_ptr != NULL && 0 != struct_size)) {
+    if (msg == NULL || (struct_ptr == NULL && 0 != struct_size)) {
         log_error("msg_with_struct_init called with NULL pointr");
         return;
     }