diff --git a/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs b/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs
index 8587b484e0afa67c7b53a7c1dbcc08d2e927c9de..eba02fac30b1b922403b1ea9b39992f868e5cca9 100644
--- a/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs
+++ b/HashingTool/ViewModel/UserControl/ManufacturerReportXMLFile.cs
@@ -79,9 +79,13 @@ namespace HashingTool.ViewModel.UserControl
 			}
 			var components = XMLManufacturerReportReader.GetContainingComponents(_xmlFile.Document).GroupBy(s => s)
 				.Select(g => new { Entry = g.Key, Count = g.Count() });
-			var jobComponents = _jobData == null ? new ViewModel.ComponentEntry[] { } : _jobData.Components.ToArray();
+			var jobComponents = _jobData?.JobDataValid == null || !_jobData.JobDataValid.Value ? new ViewModel.ComponentEntry[] { } : _jobData.Components.ToArray();
 			_validationErrors.Clear();
 
+			if (_jobData != null && _jobData.JobDataValid != null && !_jobData.JobDataValid.Value) {
+				_validationErrors.Add("Verifying Manufacturer Report: Job data is not valid - no validation checks against job data.");
+			}
+
 			var hasComponentsFromJob = _jobData != null && _jobData.JobDataValid != null && _jobData.JobDataValid.Value &&
 										jobComponents.Any();