diff --git a/lib/commands/ember-cli-jsdoc.js b/lib/commands/ember-cli-jsdoc.js
index <HASH>..<HASH> 100755
--- a/lib/commands/ember-cli-jsdoc.js
+++ b/lib/commands/ember-cli-jsdoc.js
@@ -16,11 +16,22 @@ module.exports = {
             exec( cmdPath + ' -c jsdoc.json', { cwd: process.cwd() }, function( error, stdout, stderr ) {
                 console.log( stderr );
 
+                var shouldReject = false;
+
                 if ( error ) {
-                    console.log( chalk.red( 'AN ERROR HAS OCCURRED PREVENTING DOCUMENTATION GENERATION' ) );
+                    console.log( chalk.red( 'EMBER-CLI-JSDOC: ERRORs have occurred during documentation generation' ) );
+                    shouldReject = true;
+                }
+
+                if ( /WARNING/.test( stderr ) ) {
+                    console.log( chalk.yellow( 'EMBER-CLI-JSDOC: WARNINGS have occurred during documentation generation' ) );
+                }
+
+                if ( shouldReject ) {
                     reject();
+
                 } else {
-                    console.log( chalk.yellow( 'ONLY WARNINGS OCCURRED' ) );
+                    console.log( chalk.green( 'EMBER-CLI-JSDOC: Documentation was successfully generated' ) );
                     resolve();
                 }
             });
Closes softlayer/ember-cli-jsdoc#9