diff --git a/modules/org.restlet/src/org/restlet/Message.java b/modules/org.restlet/src/org/restlet/Message.java
index f9a7927148..607a44162c 100644
--- a/modules/org.restlet/src/org/restlet/Message.java
+++ b/modules/org.restlet/src/org/restlet/Message.java
@@ -272,8 +272,13 @@ public String getEntityAsText() {
      */
     @SuppressWarnings("unchecked")
     public Series<Header> getHeaders() {
-        return (Series<Header>) getAttributes().get(
+        Series<Header> headers = (Series<Header>) getAttributes().get(
                 HeaderConstants.ATTRIBUTE_HEADERS);
+        if (headers == null) {
+            headers = new Series<Header>(Header.class);
+            getAttributes().put(HeaderConstants.ATTRIBUTE_HEADERS, headers);
+        }
+        return headers;
     }
 
     /**