diff --git a/VectoMockup/VectoMockup/MockupModalDataContainer.cs b/VectoMockup/VectoMockup/MockupModalDataContainer.cs
index 859eed4b4883034157ece099f870988ac5961c70..c5ddedd060b2972d1097bbf27746368bb0c35f82 100644
--- a/VectoMockup/VectoMockup/MockupModalDataContainer.cs
+++ b/VectoMockup/VectoMockup/MockupModalDataContainer.cs
@@ -54,8 +54,8 @@ namespace TUGraz.VectoMockup
 
 		#region MockupImplementation
 
-		public Second Duration => Second.Create(60*60*1);
-		public Meter Distance => Meter.Create(100 * 1000);
+		public Second Duration => 1.SI(Unit.SI.Hour).Cast<Second>();
+		public Meter Distance => 100.SI(Unit.SI.Kilo.Meter).Cast<Meter>();
 
 
 		#endregion
diff --git a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs b/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs
index 8bfa286065787a47c3c65062b46b4bf16ee25826..6f070edf36b06a0e460b849d6460e280da50950d 100644
--- a/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs
+++ b/VectoMockup/VectoMockup/Reports/XMLDeclarationMockupPrimaryReport.cs
@@ -40,8 +40,8 @@ namespace TUGraz.VectoMockup.Reports
 
 		protected override void WriteResult(ResultEntry result)
 		{
-			(ManufacturerRpt as IXMLMockupReport).WriteMockupResult(result);
-			(PrimaryReport as IXMLMockupReport).WriteMockupResult(result);
+			(ManufacturerRpt as IXMLMockupReport)?.WriteMockupResult(result);
+			(PrimaryReport as IXMLMockupReport)?.WriteMockupResult(result);
 		}
 
 		#endregion
@@ -51,11 +51,11 @@ namespace TUGraz.VectoMockup.Reports
 		protected override void GenerateReports()
 		{
 			if (!_exempted) {
-				(ManufacturerRpt as IXMLMockupReport).WriteMockupSummary(Results.First());
-				(PrimaryReport as IXMLMockupReport).WriteMockupSummary(Results.First());
+				(ManufacturerRpt as IXMLMockupReport)?.WriteMockupSummary(Results.First());
+				(PrimaryReport as IXMLMockupReport)?.WriteMockupSummary(Results.First());
 			} else {
-				(ManufacturerRpt as IXMLMockupReport).WriteExemptedResults();
-				(PrimaryReport as IXMLMockupReport).WriteExemptedResults();
+				(ManufacturerRpt as IXMLMockupReport)?.WriteExemptedResults();
+				(PrimaryReport as IXMLMockupReport)?.WriteExemptedResults();
 			}
 
 			ManufacturerRpt.GenerateReport();