From e2d5fbf545a47e15d68ce7f248843fa47b5bd20d Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 19 Feb 2014 17:27:08 +1100
Subject: [PATCH] Fixes issue with ensuring properties on entities when a new
 property type has been created - but if the property type doesn't have an id,
 we should ignore it.

---
 .../Persistence/Repositories/VersionableRepositoryBase.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
index 0a5535d719..a9bc878195 100644
--- a/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
@@ -117,7 +117,7 @@ namespace Umbraco.Core.Persistence.Repositories
             var propertyFactory = new PropertyFactory(contentType, versionId, id, createDate, updateDate);
             var properties = propertyFactory.BuildEntity(propertyDataDtos).ToArray();
 
-            var newProperties = properties.Where(x => x.HasIdentity == false);
+            var newProperties = properties.Where(x => x.HasIdentity == false && x.PropertyType.HasIdentity);
             foreach (var property in newProperties)
             {
                 var propertyDataDto = new PropertyDataDto { NodeId = id, PropertyTypeId = property.PropertyTypeId, VersionId = versionId };