Merge branch 'master' into localStorage-clean-up

2 files changed, 7 insertions, 0 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91bf01b44..f9fa0f5d0 100644
--- a/CHANGELOG.md
+++ b/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
 
diff --git a/ui/app/accounts/import/json.js b/ui/app/accounts/import/json.js
index 158a3c923..15f9816e7 100644
--- a/ui/app/accounts/import/json.js
+++ b/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) {