Hi all, upgrade from CMS 7.19 to 8.10 and CM 8.7.1 to 8.15

When saving in the CMS i do get the following Commerce related issue:

dojo.js: /EPiServer/cms/Stores/contentdata/39429_4479166

This issue is only on new templates, not all templates.

[NullReferenceException: Object reference not set to an instance of an object.]
   EPiServer.Commerce.Routing.<>c__DisplayClass9.b__8(CatalogContent c) +27
   System.Linq.Enumerable.FirstOrDefault(IEnumerable`1 source, Func`2 predicate) +168
   System.Linq.WhereSelectEnumerableIterator`2.MoveNext() +247
   System.Linq.Enumerable.FirstOrDefault(IEnumerable`1 source) +246
   EPiServer.Commerce.Routing.RoutingSegmentValidator.GetExistingContentBySegment(String urlSegment, CultureInfo language) +353
   EPiServer.Commerce.Routing.RoutingSegmentValidator.Validate(IContent instance) +399
   EPiServer.Validation.ValidationService.ValidateRecursively(Object instance, HashSet`1 visitedInstances) +318
   EPiServer.Cms.Shell.UI.Rest.ContentChangeManager.UpdateContentProperties(ContentReference contentReference, IDictionary`2 properties, SaveAction saveAction) +757
   EPiServer.Cms.Shell.UI.Rest.ContentDataStore.Patch(PatchContentDataModel entity) +366
   lambda_method(Closure , ControllerBase , Object[] ) +126
   System.Web.Mvc.ReflectedActionDescriptor.Execute(ControllerContext controllerContext, IDictionary`2 parameters) +260
   System.Web.Mvc.ControllerActionInvoker.InvokeActionMethod(ControllerContext controllerContext, ActionDescriptor actionDescriptor, IDictionary`2 parameters) +38
   System.Web.Mvc.Async.<>c__DisplayClass42.b__41() +33
   System.Web.Mvc.Async.<>c__DisplayClass39.b__33() +123
   System.Web.Mvc.Async.<>c__DisplayClass4f.b__49() +838795
   System.Web.Mvc.Async.<>c__DisplayClass4f.b__49() +838795
   System.Web.Mvc.Async.<>c__DisplayClass37.b__36(IAsyncResult asyncResult) +15
   System.Web.Mvc.Async.<>c__DisplayClass2a.b__20() +33
   System.Web.Mvc.Async.<>c__DisplayClass25.b__22(IAsyncResult asyncResult) +839380
   EPiServer.Shell.Services.Rest.RestControllerBase.EndExecute(IAsyncResult asyncResult) +175
   System.Web.CallHandlerExecutionStep.System.Web.HttpApplication.IExecutionStep.Execute() +606
   System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +288

Properties on the type:

Field name	Type		Required
Heading		Main heading 	Long string (>255) 
ArticleImage 	Article Push Image (460px width) 	URL to page/external address 
PushText 	Intro Push Text 	XHTML string (>255) 
RightText 	Right text 	XHTML string (>255) 
RightColumn 	Right column 	XHTML string (>255) 
BottomBlockContainer Lower Blockcontainer 	ContentArea 

Any idea where to start? Routing problem? How to debug?