diff --git a/VectoCore/VectoCore/Models/Declaration/Segments.cs b/VectoCore/VectoCore/Models/Declaration/Segments.cs
index e261435519c09c8cf1df67875aaf72628d80758a..e84a1baae475820f47f112e297ab4772766d6792 100644
--- a/VectoCore/VectoCore/Models/Declaration/Segments.cs
+++ b/VectoCore/VectoCore/Models/Declaration/Segments.cs
@@ -182,7 +182,7 @@ namespace TUGraz.VectoCore.Models.Declaration
 		{
 			var missionTypes = Enum.GetValues(typeof(MissionType)).Cast<MissionType>();
 			var missions = new List<Mission>();
-			foreach (var missionType in missionTypes.Where(m => m.IsDeclarationMission() && row.Field<string>(m.ToString()) != "-")) {
+			foreach (var missionType in missionTypes.Where(m => m.IsDeclarationMission() && m != MissionType.ExemptedMission && row.Field<string>(m.ToString()) != "-")) {
 				var bodyColumn = missionType == MissionType.Construction ? "bodyconstruction" : "body";
 				var body = DeclarationData.StandardBodies.Lookup(row.Field<string>(bodyColumn));
 
diff --git a/VectoCore/VectoCore/OutputData/DeclarationReport.cs b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
index 209bfebe4e5aa071c5b1573b5eef957f73b57883..16fcc8c7ffce0f21e734e7d6e147cbb8d843c9c1 100644
--- a/VectoCore/VectoCore/OutputData/DeclarationReport.cs
+++ b/VectoCore/VectoCore/OutputData/DeclarationReport.cs
@@ -102,8 +102,8 @@ namespace TUGraz.VectoCore.OutputData
 		{
 			var missionType = mission.MissionType;
 			if (!Missions.ContainsKey(missionType)) {
-				Missions[MissionType.ExemptedMission] = new ResultContainer<T>() {
-					Mission = MissionType.ExemptedMission,
+				Missions[missionType] = new ResultContainer<T>() {
+					Mission = missionType,
 					ResultEntry = new Dictionary<LoadingType, T>(),
 				};
 			}