From 3712a80031096c733f4fb080b29a64f913d9ef5e Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 25 Jan 2016 16:43:20 +0100
Subject: [PATCH] fixes composition check in change doc type

---
 src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
index ce9d84f31b..dc9e9b5ebc 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
@@ -194,7 +194,7 @@ namespace Umbraco.Web.UI.Umbraco.Dialogs
         private IEnumerable<PropertyType> GetPropertiesOfContentType(IContentType contentType)
         {
             var properties = contentType.PropertyTypes.ToList();
-            while (contentType.ParentId > -1)
+            while (contentType.ParentId > -1 && contentType.CompositionAliases().Any())
             {
                 contentType = ApplicationContext.Current.Services.ContentTypeService.GetContentType(contentType.ParentId);
                 properties.AddRange(contentType.PropertyTypes);