diff --git a/lib/repl.js b/lib/repl.js
index f15380e67f..76c7487b7b 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -1082,6 +1082,9 @@ function defineDefaultCommands(repl) {
               self.write(line + '\n');
             }
           });
+        } else {
+          this.outputStream.write('Failed to load:' + file +
+                                  ' is not a valid file\n');
         }
       } catch (e) {
         this.outputStream.write('Failed to load:' + file + '\n');
diff --git a/test/parallel/test-repl-.save.load.js b/test/parallel/test-repl-.save.load.js
index 2b9ceed4db..c71b383bcd 100644
--- a/test/parallel/test-repl-.save.load.js
+++ b/test/parallel/test-repl-.save.load.js
@@ -61,6 +61,14 @@ putIn.write = function(data) {
 };
 putIn.run(['.load ' + loadFile]);
 
+// throw error on loading directory
+loadFile = common.tmpDir;
+putIn.write = function(data) {
+  assert.equal(data, 'Failed to load:' + loadFile + ' is not a valid file\n');
+  putIn.write = function() {};
+};
+putIn.run(['.load ' + loadFile]);
+
 // clear the REPL
 putIn.run(['.clear']);