diff --git a/src/actions/__tests__/config.spec.js b/src/actions/__tests__/config.spec.js
index 26de726d..ffd102ea 100644
--- a/src/actions/__tests__/config.spec.js
+++ b/src/actions/__tests__/config.spec.js
@@ -5,7 +5,7 @@ describe('config', () => {
     it('should throw if media_folder is not defined in config', () => {
       expect(() => {
         config.applyDefaults({ foo: 'bar' });
-      }).toThrowError('Config: `media_folder` setting could not be found in config.');
+      }).toThrowError('Error in configuration file: A `media_folder` wasn\'t found. Check your config.yml file.');
     });
 
     it('should set publish_mode if not set', () => {
diff --git a/src/actions/config.js b/src/actions/config.js
index d6eee944..d617cb90 100644
--- a/src/actions/config.js
+++ b/src/actions/config.js
@@ -15,7 +15,7 @@ const defaults = {
 
 export function applyDefaults(config) {
   if (!('media_folder' in config)) {
-    throw new Error('Config: `media_folder` setting could not be found in config.');
+    throw new Error('Error in configuration file: A `media_folder` wasn\'t found. Check your config.yml file.');
   }
 
   // Make sure there is a public folder