diff --git a/src/org/jgroups/Message.java b/src/org/jgroups/Message.java
index 681ffef7d54..772022ba6ce 100644
--- a/src/org/jgroups/Message.java
+++ b/src/org/jgroups/Message.java
@@ -333,7 +333,7 @@ public String printHeaders() {
     }
 
     public int getNumHeaders() {
-        return headers.size();
+        return headers != null? headers.size() : 0;
     }
 
    /**