diff --git a/lib/Cake/Console/Shell.php b/lib/Cake/Console/Shell.php
index 830181949..88dc5fb58 100644
--- a/lib/Cake/Console/Shell.php
+++ b/lib/Cake/Console/Shell.php
@@ -30,6 +30,13 @@ App::uses('File', 'Utility');
  */
 class Shell extends Object {
 
+/**
+ * Default error code
+ *
+ * @var int
+ */
+	const CODE_ERROR = 1;
+
 /**
  * Output constant making verbose shells.
  *
@@ -573,7 +580,8 @@ class Shell extends Object {
 		$result = $this->stdin->read();
 
 		if ($result === false) {
-			return $this->_stop(1);
+			$this->_stop(self::CODE_ERROR);
+			return self::CODE_ERROR;
 		}
 		$result = trim($result);
 
@@ -720,7 +728,8 @@ class Shell extends Object {
 		if (!empty($message)) {
 			$this->err($message);
 		}
-		return $this->_stop(1);
+		$this->_stop(self::CODE_ERROR);
+		return self::CODE_ERROR;
 	}
 
 /**
@@ -758,7 +767,8 @@ class Shell extends Object {
 
 			if (strtolower($key) === 'q') {
 				$this->out(__d('cake_console', '<error>Quitting</error>.'), 2);
-				return $this->_stop();
+				$this->_stop();
+				return true;
 			} elseif (strtolower($key) !== 'y') {
 				$this->out(__d('cake_console', 'Skip `%s`', $path), 2);
 				return false;