diff --git a/source/components/utils/withLanguage.js b/source/components/utils/withLanguage.js
index 7f8b1d13b..c61b95c12 100644
--- a/source/components/utils/withLanguage.js
+++ b/source/components/utils/withLanguage.js
@@ -1,5 +1,5 @@
-import React, { Component } from 'react'
 import PropTypes from 'prop-types'
+import React, { Component } from 'react'
 
 export default function withLanguage(WrappedComponent) {
 	return class WithLanguage extends Component {
diff --git a/source/selectors/analyseSelectors.js b/source/selectors/analyseSelectors.js
index 245dc0c85..5e748e232 100644
--- a/source/selectors/analyseSelectors.js
+++ b/source/selectors/analyseSelectors.js
@@ -143,7 +143,7 @@ let initialAnalysisSelector = createSelector(
 
 let currentMissingVariablesByTargetSelector = createSelector(
 	[analysisValidatedOnlySelector],
-	analysis => collectMissingVariablesByTarget(analysis.targets)
+	analysis => analysis.targets ? collectMissingVariablesByTarget(analysis.targets) : []
 )
 
 export let missingVariablesByTargetSelector = createSelector(