diff --git a/Cargo.toml b/Cargo.toml
index af5e65b1..5b1b0712 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,7 @@ keywords = ["CMSIS", "SVD", "parser"]
 license = "MIT OR Apache-2.0"
 name = "svd-parser"
 repository = "https://github.com/japaric/svd"
-version = "0.5.2"
+version = "0.6.0"
 
 [dependencies]
 either = "1.1.0"
diff --git a/src/lib.rs b/src/lib.rs
index 2461b5d2..80199cf9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -225,7 +225,7 @@ impl Interrupt {
 pub struct ClusterInfo {
     pub name: String,
     pub description: String,
-    pub header_struct_name: String,
+    pub header_struct_name: Option<String>,
     pub address_offset: u32,
     pub size: Option<u32>,
     pub access: Option<Access>,
@@ -327,7 +327,7 @@ impl ClusterInfo {
         ClusterInfo {
             name: try!(tree.get_child_text("name")),
             description: try!(tree.get_child_text("description")),
-            header_struct_name: try!(tree.get_child_text("headerStructName")),
+            header_struct_name: tree.get_child_text("headerStructName"),
             address_offset: {
                 try!(parse::u32(try!(tree.get_child("addressOffset"))))
             },