diff --git a/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java b/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
index 8c9ed06846..cdd0848e2d 100644
--- a/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
+++ b/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
@@ -33,6 +33,7 @@ import org.apache.commons.io.IOUtils;
 import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.CollectionProperty;
+import org.apache.jmeter.testelement.property.JMeterProperty;
 import org.apache.jorphan.util.JOrphanUtils;
 
 /**
@@ -69,6 +70,11 @@ public class HeaderManager extends ConfigTestElement implements Serializable {
         setProperty(new CollectionProperty(HEADERS, new ArrayList()));
     }
 
+    /**
+     * Get the collection of JMeterProperty entries representing the headers.
+     * 
+     * @return the header collection property
+     */
     public CollectionProperty getHeaders() {
         return (CollectionProperty) getProperty(HEADERS);
     }
@@ -100,8 +106,10 @@ public class HeaderManager extends ConfigTestElement implements Serializable {
         }
         PrintWriter writer = new PrintWriter(new FileWriter(file));
         writer.println("# JMeter generated Header file");// $NON-NLS-1$
-        for (int i = 0; i < getHeaders().size(); i++) {
-            Header head = (Header) getHeaders().get(i);
+        final CollectionProperty hdrs = getHeaders();
+        for (int i = 0; i < hdrs.size(); i++) {
+            final JMeterProperty hdr = hdrs.get(i);
+            Header head = (Header) hdr.getObjectValue();
             writer.println(head.toString());
         }
         writer.flush();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6c90ad8d06..2065f5c103 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -200,6 +200,7 @@ JMeter now removes extraneous leading "../" segments (as do many browsers)
 <li>Bug 46844 -  "Library" label in test plan are not I18N</li>
 <li>Bug 46977 -  JMeter does not handle HTTP headers not delimited by whitespace</li>
 <li>Remove Host from headers saved by the Proxy server, as that will normally be generated by the HTTP stack</li>
+<li>Bug 46993 - Saving from Header Manager generates ClassCastException</li>
 </ul>
 
 <h3>Improvements</h3>