diff --git a/src/App/DynamicProperty.cpp b/src/App/DynamicProperty.cpp
index 75c427f916..343ae84f63 100644
--- a/src/App/DynamicProperty.cpp
+++ b/src/App/DynamicProperty.cpp
@@ -437,12 +437,14 @@ void DynamicProperty::Restore(Base::XMLReader &reader)
 #endif
             }
             else if (prop) {
-                Base::Console().Warning("%s: Overread data for property %s of type %s, expected type is %s\n",
-                    pc->getTypeId().getName(), prop->getName(), prop->getTypeId().getName(), TypeName);
+                //Base::Console().Warning("%s: Overread data for property %s of type %s, expected type is %s\n",
+                //    pc->getTypeId().getName(), prop->getName(), prop->getTypeId().getName(), TypeName);
+                pc->handleChangedPropertyType(reader, TypeName, prop);
             }
             else {
-                Base::Console().Warning("%s: No property found with name %s and type %s\n",
-                    pc->getTypeId().getName(), PropName, TypeName);
+                //Base::Console().Warning("%s: No property found with name %s and type %s\n",
+                //    pc->getTypeId().getName(), PropName, TypeName);
+                pc->handleChangedPropertyName(reader, TypeName, PropName);
             }
         }
         reader.readEndElement("Property");
diff --git a/src/App/PropertyContainer.h b/src/App/PropertyContainer.h
index bbd716bfd8..d767af08a8 100644
--- a/src/App/PropertyContainer.h
+++ b/src/App/PropertyContainer.h
@@ -36,6 +36,7 @@ namespace App
 {
 class Property;
 class PropertyContainer;
+class DynamicProperty;
 class DocumentObject;
 class Extension;
 
@@ -184,6 +185,7 @@ public:
 
 
   friend class Property;
+  friend class DynamicProperty;
 
 
 protected: