diff --git a/tools/svdconv/SVDModel/src/SvdCpu.cpp b/tools/svdconv/SVDModel/src/SvdCpu.cpp
index ba5351185..417dd0386 100644
--- a/tools/svdconv/SVDModel/src/SvdCpu.cpp
+++ b/tools/svdconv/SVDModel/src/SvdCpu.cpp
@@ -238,38 +238,40 @@ bool SvdCpu::ProcessXmlAttributes(XMLTreeElement* xmlElement)
 
 bool SvdCpu::CopyItem(SvdItem *from)
 {
-  const auto pFrom = (SvdCpu*) from;
-
-  const auto&  revisionStr         = GetRevisionStr          ();
-  const auto   revision            = GetRevision             ();
-  const auto   nvicPrioBits        = GetNvicPrioBits         ();
-  const auto   mpuPresent          = GetMpuPresent           ();
-  const auto   fpuPresent          = GetFpuPresent           ();
-  const auto   vendorSystickConfig = GetVendorSystickConfig  ();
-  const auto   fpuDP               = GetFpuDP                ();
-  const auto   icachePresent       = GetIcachePresent        ();
-  const auto   dcachePresent       = GetDcachePresent        ();
-  const auto   itcmPresent         = GetItcmPresent          ();
-  const auto   dtcmPresent         = GetDtcmPresent          ();
-  const auto   vtorPresent         = GetVtorPresent          ();
-  const auto   endian              = GetEndian               ();
-  const auto   type                = GetType                 ();
-
-  if(revisionStr         == "")                       { SetRevisionStr          (pFrom->GetRevisionStr          ()); }
-  if(revision            == 0 )                       { SetRevision             (pFrom->GetRevision             ()); }
-  if(nvicPrioBits        == 0 )                       { SetNvicPrioBits         (pFrom->GetNvicPrioBits         ()); }
-  if(mpuPresent          == 0 )                       { SetMpuPresent           (pFrom->GetMpuPresent           ()); }
-  if(fpuPresent          == 0 )                       { SetFpuPresent           (pFrom->GetFpuPresent           ()); }
-  if(vendorSystickConfig == 0 )                       { SetVendorSystickConfig  (pFrom->GetVendorSystickConfig  ()); }
-  if(fpuDP               == 0 )                       { SetFpuDP                (pFrom->GetFpuDP                ()); }
-  if(icachePresent       == 0 )                       { SetIcachePresent        (pFrom->GetIcachePresent        ()); }
-  if(dcachePresent       == 0 )                       { SetDcachePresent        (pFrom->GetDcachePresent        ()); }
-  if(itcmPresent         == 0 )                       { SetItcmPresent          (pFrom->GetItcmPresent          ()); }
-  if(dtcmPresent         == 0 )                       { SetDtcmPresent          (pFrom->GetDtcmPresent          ()); }
-  if(vtorPresent         == 0 )                       { SetVtorPresent          (pFrom->GetVtorPresent          ()); }
-  if(endian              == SvdTypes::Endian::UNDEF)  {  SetEndian              (pFrom->GetEndian               ()); }
-  if(type                == SvdTypes::CpuType::UNDEF) { SetType                 (pFrom->GetType                 ()); }
-
+  const auto pFrom = dynamic_cast<SvdCpu*>(from);
+
+  if(pFrom) {
+    const auto&  revisionStr         = GetRevisionStr          ();
+    const auto   revision            = GetRevision             ();
+    const auto   nvicPrioBits        = GetNvicPrioBits         ();
+    const auto   mpuPresent          = GetMpuPresent           ();
+    const auto   fpuPresent          = GetFpuPresent           ();
+    const auto   vendorSystickConfig = GetVendorSystickConfig  ();
+    const auto   fpuDP               = GetFpuDP                ();
+    const auto   icachePresent       = GetIcachePresent        ();
+    const auto   dcachePresent       = GetDcachePresent        ();
+    const auto   itcmPresent         = GetItcmPresent          ();
+    const auto   dtcmPresent         = GetDtcmPresent          ();
+    const auto   vtorPresent         = GetVtorPresent          ();
+    const auto   endian              = GetEndian               ();
+    const auto   type                = GetType                 ();
+
+    if(revisionStr         == "")                       { SetRevisionStr          (pFrom->GetRevisionStr          ()); }
+    if(revision            == 0 )                       { SetRevision             (pFrom->GetRevision             ()); }
+    if(nvicPrioBits        == 0 )                       { SetNvicPrioBits         (pFrom->GetNvicPrioBits         ()); }
+    if(mpuPresent          == 0 )                       { SetMpuPresent           (pFrom->GetMpuPresent           ()); }
+    if(fpuPresent          == 0 )                       { SetFpuPresent           (pFrom->GetFpuPresent           ()); }
+    if(vendorSystickConfig == 0 )                       { SetVendorSystickConfig  (pFrom->GetVendorSystickConfig  ()); }
+    if(fpuDP               == 0 )                       { SetFpuDP                (pFrom->GetFpuDP                ()); }
+    if(icachePresent       == 0 )                       { SetIcachePresent        (pFrom->GetIcachePresent        ()); }
+    if(dcachePresent       == 0 )                       { SetDcachePresent        (pFrom->GetDcachePresent        ()); }
+    if(itcmPresent         == 0 )                       { SetItcmPresent          (pFrom->GetItcmPresent          ()); }
+    if(dtcmPresent         == 0 )                       { SetDtcmPresent          (pFrom->GetDtcmPresent          ()); }
+    if(vtorPresent         == 0 )                       { SetVtorPresent          (pFrom->GetVtorPresent          ()); }
+    if(endian              == SvdTypes::Endian::UNDEF)  {  SetEndian              (pFrom->GetEndian               ()); }
+    if(type                == SvdTypes::CpuType::UNDEF) { SetType                 (pFrom->GetType                 ()); }
+  }
+  
   SvdItem::CopyItem(from);
 
   return false;
diff --git a/tools/svdconv/SVDModel/src/SvdEnum.cpp b/tools/svdconv/SVDModel/src/SvdEnum.cpp
index d8eba86f4..14fd6a315 100644
--- a/tools/svdconv/SVDModel/src/SvdEnum.cpp
+++ b/tools/svdconv/SVDModel/src/SvdEnum.cpp
@@ -225,21 +225,23 @@ bool SvdEnum::SetValue(uint64_t value)
 
 bool SvdEnum::CopyItem(SvdItem *from)
 {
-  const auto pFrom = (SvdEnum*) from;
+  const auto pFrom = dynamic_cast<SvdEnum*>(from);
 
   bool valValid  = GetValue ().bValid;
   bool isDefault = IsDefault();
 
-  if(!valValid) {
-    if(pFrom->GetValue().bValid) {
-      SetValue(pFrom->GetValue().u32);
+  if(pFrom) {
+    if(!valValid) {
+      if(pFrom->GetValue().bValid) {
+        SetValue(pFrom->GetValue().u32);
+      }
     }
-  }
 
-  if(isDefault == 0 ) {
-    SetIsDefault(pFrom->IsDefault());
+    if(isDefault == 0 ) {
+      SetIsDefault(pFrom->IsDefault());
+    }
   }
-
+  
   return SvdItem::CopyItem(from);
 }