diff --git a/lib/manager/components/validation/GtfsValidationSummary.js b/lib/manager/components/validation/GtfsValidationSummary.js
index 528a0f43f..a6e724b5b 100644
--- a/lib/manager/components/validation/GtfsValidationSummary.js
+++ b/lib/manager/components/validation/GtfsValidationSummary.js
@@ -55,6 +55,7 @@ export class ValidationSummaryTable extends Component {
     const {
       version
     } = this.props
+    // FIXME NPE on validationresult error_counts?
     if (version && version.validationResult && version.validationResult.error_counts.length === 0) {
       return <div className='lead text-center '>No validation issues found.</div>
     } else if (!version || !version.validationResult) {
diff --git a/lib/manager/components/version/FeedVersionViewer.js b/lib/manager/components/version/FeedVersionViewer.js
index e4ed19013..1d2f35e60 100644
--- a/lib/manager/components/version/FeedVersionViewer.js
+++ b/lib/manager/components/version/FeedVersionViewer.js
@@ -199,13 +199,15 @@ class VersionSectionSelector extends Component {
 
   _renderIssuesLabel (version) {
     const tableFatalExceptions = getTableFatalExceptions(version)
-    const hasCriticalError = version.validationSummary.loadStatus !== 'SUCCESS' ||
-      version.feedLoadResult.fatalException || tableFatalExceptions.length > 0
+    const {validationSummary, feedLoadResult} = version
+    const hasCriticalError = validationSummary.loadStatus !== 'SUCCESS' ||
+      !feedLoadResult || feedLoadResult.fatalException ||
+      tableFatalExceptions.length > 0
     const color = this.props.validationJob
       ? 'warning'
       : hasCriticalError
       ? 'danger'
-      : version.validationSummary.errorCount
+      : validationSummary.errorCount
       ? 'warning'
       : 'success'
     const text = this.props.validationJob