diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
index 8a450aefd9..ace3f0bc85 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
@@ -560,11 +560,14 @@ AND umbracoNode.id <> @id",
                 var contentTypes = MapContentTypes(contentTypeIds, db, out allAssociatedTemplates, out allParentContentTypeIds)
                     .ToArray();
 
-                MapContentTypeTemplates(
-                        contentTypes, db, contentTypeRepository, templateRepository, allAssociatedTemplates);
+                if (contentTypes.Any())
+                {
+                    MapContentTypeTemplates(
+                            contentTypes, db, contentTypeRepository, templateRepository, allAssociatedTemplates);
 
-                MapContentTypeChildren(
-                        contentTypes, db, contentTypeRepository, allParentContentTypeIds);     
+                    MapContentTypeChildren(
+                            contentTypes, db, contentTypeRepository, allParentContentTypeIds);         
+                }
 
                 return contentTypes;
             }
@@ -590,24 +593,29 @@ AND umbracoNode.id <> @id",
                 
                 //NOTE: SQL call #3++
 
-                var allParentIdsAsArray = allParentContentTypeIds.SelectMany(x => x.Value).Distinct().ToArray();
-                if (allParentIdsAsArray.Any())
+                if (allParentContentTypeIds != null)
                 {
-                    var allParentContentTypes = contentTypeRepository.GetAll(allParentIdsAsArray).ToArray();
-                    foreach (var contentType in contentTypes)
+                    var allParentIdsAsArray = allParentContentTypeIds.SelectMany(x => x.Value).Distinct().ToArray();
+                    if (allParentIdsAsArray.Any())
                     {
-                        var parentContentTypes = allParentContentTypes.Where(x => allParentContentTypeIds[contentType.Id].Contains(x.Id));
-                        foreach (var parentContentType in parentContentTypes)
+                        var allParentContentTypes = contentTypeRepository.GetAll(allParentIdsAsArray).ToArray();
+                        foreach (var contentType in contentTypes)
                         {
-                            var result = contentType.AddContentType(parentContentType);
-                            //Do something if adding fails? (Should hopefully not be possible unless someone created a circular reference)    
-                        }
+                            var parentContentTypes = allParentContentTypes.Where(x => allParentContentTypeIds[contentType.Id].Contains(x.Id));
+                            foreach (var parentContentType in parentContentTypes)
+                            {
+                                var result = contentType.AddContentType(parentContentType);
+                                //Do something if adding fails? (Should hopefully not be possible unless someone created a circular reference)    
+                            }
 
-                        //on initial construction we don't want to have dirty properties tracked
-                        // http://issues.umbraco.org/issue/U4-1946
-                        ((Entity)contentType).ResetDirtyProperties(false);
+                            //on initial construction we don't want to have dirty properties tracked
+                            // http://issues.umbraco.org/issue/U4-1946
+                            ((Entity)contentType).ResetDirtyProperties(false);
+                        }
                     }
                 }
+
+                
             }
 
             internal static void MapContentTypeTemplates<TRepo>(IContentType[] contentTypes,
@@ -617,6 +625,8 @@ AND umbracoNode.id <> @id",
                 IDictionary<int, IEnumerable<AssociatedTemplate>> associatedTemplates)
                 where TRepo : IRepositoryQueryable<int, TEntity>
             {
+                if (associatedTemplates == null || associatedTemplates.Any() == false) return;
+
                 //NOTE: SQL call #3++
                 //SEE: http://issues.umbraco.org/issue/U4-5174 to fix this
 
diff --git a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
index 3335d298b8..c81d8c3f4e 100644
--- a/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MemberTypeServiceTests.cs
@@ -162,8 +162,8 @@ namespace Umbraco.Tests.Services
             contentType1.RemovePropertyType(alias);
             ServiceContext.MemberTypeService.Save(contentType1);
 
-            var reQueried = ServiceContext.ContentTypeService.GetContentType(contentType1.Id);
-            var reContent = ServiceContext.ContentService.GetById(contentItems1.First().Id);
+            var reQueried = ServiceContext.MemberTypeService.Get(contentType1.Id);
+            var reContent = ServiceContext.MemberService.GetById(contentItems1.First().Id);
 
             foreach (var c in contentItems1)
             {