Merge branch 'master' into localStorage-clean-up

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Current Master
 
 - Remove BlacklistController from disk state
+- Add warning for importing some kinds of files.
 
 ## 3.13.8 2018-1-29
 

ui/app/accounts/import/json.js

@@ -81,6 +81,12 @@ JsonImportSubview.prototype.createKeyringOnEnter = function (event) {
 
 JsonImportSubview.prototype.createNewKeychain = function () {
   const state = this.state
+
+  if (!state) {
+    const message = 'You must select a valid file to import.'
+    return this.props.dispatch(actions.displayWarning(message))
+  }
+
   const { fileContents } = state
 
   if (!fileContents) {