diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index 7c42446ea..15fe5490c 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -904,8 +904,11 @@ namespace BeWoPlanerMobil.Controllers
                 {
                     continue;
                 }
-
-                goalTreeDic[zielMitEltern.ParentOid.Value].Children.Add(zielMitEltern);
+                if (goalTreeDic.ContainsKey(zielMitEltern.ParentOid.Value))
+                {
+                    goalTreeDic[zielMitEltern.ParentOid.Value].Children.Add(zielMitEltern);
+                }
+                
             }
 
             foreach(var ziel in massnahmen)
@@ -965,9 +968,9 @@ namespace BeWoPlanerMobil.Controllers
             {
                 var parentDC = ValueListService.GetValueListEntryByOid(pParentOid);
 
-                if(parentDC?.ValueListEntryOid is null)
+                if(parentDC?.ValueListEntryOid is null || parentDC?.IsActive == false)
                 {
-                    continue;
+                    break;
                 }
 
                 if(!_ParentGoals.ContainsKey(parentDC.ValueListEntryOid.Value))