Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -ra28b9a98c77a5e400a82bc891ec5816fe65f84b3 -r7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9
--- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision a28b9a98c77a5e400a82bc891ec5816fe65f84b3)
+++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs	(.../PipingPlugin.cs)	(revision 7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9)
@@ -316,7 +316,7 @@
                 GetViewName = (view, context) => PipingFormsResources.ProbabilisticProfileSpecificOutput_DisplayName,
                 Image = RiskeerCommonFormsResources.GeneralOutputIcon,
                 CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData,
-                AdditionalDataCheck = context => context.WrappedData.HasOutput && context.WrappedData.Output.ProfileSpecificOutput is PartialProbabilisticFaultTreePipingOutput,
+                AdditionalDataCheck = context => !context.WrappedData.HasOutput || context.WrappedData.Output.ProfileSpecificOutput is PartialProbabilisticFaultTreePipingOutput,
                 CreateInstance = context => new ProbabilisticFaultTreePipingProfileSpecificOutputView(
                     context.WrappedData,
                     () => ((PartialProbabilisticFaultTreePipingOutput) context.WrappedData.Output?.ProfileSpecificOutput)?.GeneralResult)
@@ -328,7 +328,7 @@
                 GetViewName = (view, context) => PipingFormsResources.ProbabilisticProfileSpecificOutput_DisplayName,
                 Image = RiskeerCommonFormsResources.GeneralOutputIcon,
                 CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData,
-                AdditionalDataCheck = context => !context.WrappedData.HasOutput || context.WrappedData.Output.ProfileSpecificOutput is PartialProbabilisticSubMechanismPipingOutput,
+                AdditionalDataCheck = context => context.WrappedData.HasOutput && context.WrappedData.Output.ProfileSpecificOutput is PartialProbabilisticSubMechanismPipingOutput,
                 CreateInstance = context =>
                 {
                     return new ProbabilisticSubMechanismPipingProfileSpecificOutputView(
@@ -343,7 +343,7 @@
                 GetViewName = (view, context) => PipingFormsResources.ProbabilisticSectionSpecificOutput_DisplayName,
                 Image = RiskeerCommonFormsResources.GeneralOutputIcon,
                 CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData,
-                AdditionalDataCheck = context => context.WrappedData.HasOutput && context.WrappedData.Output.SectionSpecificOutput is PartialProbabilisticFaultTreePipingOutput,
+                AdditionalDataCheck = context => !context.WrappedData.HasOutput || context.WrappedData.Output.SectionSpecificOutput is PartialProbabilisticFaultTreePipingOutput,
                 CreateInstance = context =>
                 {
                     return new ProbabilisticFaultTreePipingSectionSpecificOutputView(
@@ -358,7 +358,7 @@
                 GetViewName = (view, context) => PipingFormsResources.ProbabilisticSectionSpecificOutput_DisplayName,
                 Image = RiskeerCommonFormsResources.GeneralOutputIcon,
                 CloseForData = RiskeerPluginHelper.ShouldCloseViewWithCalculationData,
-                AdditionalDataCheck = context => !context.WrappedData.HasOutput || context.WrappedData.Output.SectionSpecificOutput is PartialProbabilisticSubMechanismPipingOutput,
+                AdditionalDataCheck = context => context.WrappedData.HasOutput && context.WrappedData.Output.SectionSpecificOutput is PartialProbabilisticSubMechanismPipingOutput,
                 CreateInstance = context =>
                 {
                     return new ProbabilisticSubMechanismPipingSectionSpecificOutputView(
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r420ca9ccccacb8ec96c1a02b61dbe333f9da37b4 -r7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 420ca9ccccacb8ec96c1a02b61dbe333f9da37b4)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingProfileSpecificOutputViewInfoTest.cs)	(revision 7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9)
@@ -104,7 +104,7 @@
         }
         
         [Test]
-        public void AdditionalDataCheck_CalculationWithoutOutput_ReturnsFalse()
+        public void AdditionalDataCheck_CalculationWithoutOutput_ReturnsTrue()
         {
             // Setup
             var mocks = new MockRepository();
@@ -118,7 +118,7 @@
             bool additionalDataCheck = info.AdditionalDataCheck(context);
             
             // Assert
-            Assert.IsFalse(additionalDataCheck);
+            Assert.IsTrue(additionalDataCheck);
             mocks.VerifyAll();
         }
 
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -r420ca9ccccacb8ec96c1a02b61dbe333f9da37b4 -r7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision 420ca9ccccacb8ec96c1a02b61dbe333f9da37b4)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticFaultTreePipingSectionSpecificOutputViewInfoTest.cs)	(revision 7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AdditionalDataCheck_CalculationWithoutOutput_ReturnsFalse()
+        public void AdditionalDataCheck_CalculationWithoutOutput_ReturnsTrue()
         {
             // Setup
             var context = new ProbabilisticPipingSectionSpecificOutputContext(
@@ -107,7 +107,7 @@
             bool additionalDataCheck = info.AdditionalDataCheck(context);
             
             // Assert
-            Assert.IsFalse(additionalDataCheck);
+            Assert.IsTrue(additionalDataCheck);
         }
 
         [Test]
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs
===================================================================
diff -u -ra28b9a98c77a5e400a82bc891ec5816fe65f84b3 -r7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision a28b9a98c77a5e400a82bc891ec5816fe65f84b3)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingProfileSpecificOutputViewInfoTest.cs)	(revision 7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9)
@@ -104,7 +104,7 @@
         }
         
         [Test]
-        public void AdditionalDataCheck_CalculationWithoutOutput_ReturnsTrue()
+        public void AdditionalDataCheck_CalculationWithoutOutput_ReturnsFalse()
         {
             // Setup
             var mocks = new MockRepository();
@@ -118,7 +118,7 @@
             bool additionalDataCheck = info.AdditionalDataCheck(context);
             
             // Assert
-            Assert.IsTrue(additionalDataCheck);
+            Assert.IsFalse(additionalDataCheck);
             mocks.VerifyAll();
         }
 
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs
===================================================================
diff -u -ra28b9a98c77a5e400a82bc891ec5816fe65f84b3 -r7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision a28b9a98c77a5e400a82bc891ec5816fe65f84b3)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/ViewInfos/ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs	(.../ProbabilisticSubMechanismPipingSectionSpecificOutputViewInfoTest.cs)	(revision 7bc26f9ffe61f97cdcabd1e4bcc21f0566abb2c9)
@@ -97,7 +97,7 @@
         }
 
         [Test]
-        public void AdditionalDataCheck_CalculationWithoutOutput_ReturnsTrue()
+        public void AdditionalDataCheck_CalculationWithoutOutput_ReturnsFalse()
         {
             // Setup
             var context = new ProbabilisticPipingSectionSpecificOutputContext(
@@ -107,7 +107,7 @@
             bool additionalDataCheck = info.AdditionalDataCheck(context);
             
             // Assert
-            Assert.IsTrue(additionalDataCheck);
+            Assert.IsFalse(additionalDataCheck);
         }
 
         [Test]