diff --git a/README.md b/README.md
index 261cfd33..b963d62c 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@ Node-RED Watson Nodes for IBM Bluemix
 
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
+### New in version 0.5.8
+- Visual Reconition Node, now accepts readstream on msg.payload
+- Add passages parameter to Discovery Node 
+
 ### New in version 0.5.7
 - Fix to Tone Analyzer to allow JSON as input
 - Enabled Conversation Tone method to Tone Analyzer Node
diff --git a/package.json b/package.json
index aa654ebe..82cdfef6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "alchemy-api": "^1.3.0",
@@ -11,9 +11,10 @@
     "temp": "^0.8.3",
     "qs": "6.x",
 	  "image-type": "^2.0.2",
-    "watson-developer-cloud": "^2.31.2",
+    "watson-developer-cloud": "^2.32.1",
     "kuromoji": "^0.0.5",
-    "is-docx": "^0.0.3"
+    "is-docx": "^0.0.3",
+    "stream-to-array" : "^2.3.0" 
   },
   "repository": {
     "type": "git",
diff --git a/services/conversation/v1.js b/services/conversation/v1.js
index 1c298f60..73cc5e99 100644
--- a/services/conversation/v1.js
+++ b/services/conversation/v1.js
@@ -14,12 +14,14 @@
  * limitations under the License.
  **/
 
-module.exports = function (RED) {
+module.exports = function(RED) {
   const SERVICE_IDENTIFIER = 'conversation';
   var pkg = require('../../package.json'),
     ConversationV1 = require('watson-developer-cloud/conversation/v1'),
     serviceutils = require('../../utilities/service-utils'),
-    service = null, sUsername = null, sPassword = null;
+    service = null,
+    sUsername = null,
+    sPassword = null;
 
   service = serviceutils.getServiceCreds(SERVICE_IDENTIFIER);
 
@@ -28,13 +30,19 @@ module.exports = function (RED) {
     sPassword = service.password;
   }
 
-  RED.httpAdmin.get('/watson-conversation/vcap', function (req, res) {
-    res.json(service ? {bound_service: true} : null);
+  RED.httpAdmin.get('/watson-conversation/vcap', function(req, res) {
+    res.json(service ? {
+      bound_service: true
+    } : null);
   });
 
   function verifyPayload(node, msg) {
     if (!msg.payload) {
-      node.status({fill:'red', shape:'ring', text:'missing payload'});
+      node.status({
+        fill: 'red',
+        shape: 'ring',
+        text: 'missing payload'
+      });
       node.error('Missing property: msg.payload', msg);
       return false;
     }
@@ -57,11 +65,13 @@ module.exports = function (RED) {
 
   function verifyInputs(node, msg, config, params) {
     if (!config.workspaceid && !msg.params.workspace_id) {
-      node.error('Missing workspace_id. check node documentation.',msg);
+      node.error('Missing workspace_id. check node documentation.', msg);
       return false;
     }
     // mandatory message
-    params.input = {text:msg.payload};
+    params.input = {
+      text: msg.payload
+    };
     var prop = null;
 
     if (config.context) {
@@ -127,9 +137,13 @@ module.exports = function (RED) {
     var userName = sUsername || node.credentials.username,
       passWord = sPassword || node.credentials.password;
 
-    if ( !(userName || msg.params.username) ||
-           !(passWord || msg.params.password) ) {
-      node.status({fill:'red', shape:'ring', text:'missing credentials'});
+    if (!(userName || msg.params.username) ||
+      !(passWord || msg.params.password)) {
+      node.status({
+        fill: 'red',
+        shape: 'ring',
+        text: 'missing credentials'
+      });
       node.error('Missing Watson Conversation API service credentials', msg);
       return false;
     }
@@ -157,8 +171,11 @@ module.exports = function (RED) {
   function processResponse(err, body, node, msg, config) {
     if (err !== null && body === null) {
       node.error(err);
-      node.status({fill:'red', shape:'ring',
-        text:'call to watson conversation service failed'});
+      node.status({
+        fill: 'red',
+        shape: 'ring',
+        text: 'call to watson conversation service failed'
+      });
       return;
     }
     msg.payload = body;
@@ -179,7 +196,11 @@ module.exports = function (RED) {
   }
 
   function execute(params, node, msg, config) {
-    node.status({fill:'blue', shape:'dot' , text:'Calling Conversation service ...'});
+    node.status({
+      fill: 'blue',
+      shape: 'dot',
+      text: 'Calling Conversation service ...'
+    });
     // call POST /message through SDK
     node.service.message(params, function(err, body) {
       processResponse(err, body, node, msg, config);
@@ -187,12 +208,13 @@ module.exports = function (RED) {
   }
 
   // This is the Watson Conversation V1 (GA) Node
-  function WatsonConversationV1Node (config) {
-    var node = this, b = false;
+  function WatsonConversationV1Node(config) {
+    var node = this,
+      b = false;
 
     RED.nodes.createNode(this, config);
 
-    node.on('input', function (msg) {
+    node.on('input', function(msg) {
       var params = {};
 
       node.status({});
@@ -215,8 +237,12 @@ module.exports = function (RED) {
 
   RED.nodes.registerType('watson-conversation-v1', WatsonConversationV1Node, {
     credentials: {
-      username: {type:'text'},
-      password: {type:'password'}
+      username: {
+        type: 'text'
+      },
+      password: {
+        type: 'password'
+      }
     }
   });
 };
diff --git a/services/discovery/discovery-utils.js b/services/discovery/discovery-utils.js
index 8154396b..28447ff3 100644
--- a/services/discovery/discovery-utils.js
+++ b/services/discovery/discovery-utils.js
@@ -36,13 +36,13 @@ DiscoveryUtils.prototype = {
 
   buildParamsForPayload: function(msg, config, params) {
     var isJSON = this.isJsonString(msg.payload) ||
-                        this.isJsonObject(msg.payload);
+      this.isJsonObject(msg.payload);
 
     // Payload (text to be analysed) must be a string (content is either raw string or Buffer)
     if (typeof msg.payload === 'string' || isJSON) {
       params.file = this.isJsonObject(msg.payload) ?
-                           JSON.stringify(msg.payload) :
-                           msg.payload;
+        JSON.stringify(msg.payload) :
+        msg.payload;
     }
     return params;
   },
@@ -69,13 +69,14 @@ DiscoveryUtils.prototype = {
 
     params = this.buildParamsForName(msg, config, params);
 
-    ['environment_id','collection_id','configuration_id',
+    ['environment_id', 'collection_id', 'configuration_id',
       'collection_name',
-      'query','description','size'].forEach(function(f) {
+      'query', 'passages', 'description', 'size'
+    ].forEach(function(f) {
       params = me.buildParamsFor(msg, config, params, f);
     });
 
-    ['count','filter','aggregation','return'].forEach(function(f) {
+    ['count', 'filter', 'aggregation', 'return'].forEach(function(f) {
       params = me.buildParamsFromConfig(config, params, f);
     });
 
@@ -107,11 +108,14 @@ DiscoveryUtils.prototype = {
       }
       params.query += config.query3 + ':"' + config.queryvalue3 + '"';
     }
+    if (config.passages) {
+      params.passages = config.passages;
+    }
 
     return params;
   },
 
-  paramEnvCheck: function (params) {
+  paramEnvCheck: function(params) {
     var response = '';
     if (!params.environment_id) {
       response = 'Missing Environment ID ';
@@ -119,7 +123,7 @@ DiscoveryUtils.prototype = {
     return response;
   },
 
-  paramJSONCheck: function (params) {
+  paramJSONCheck: function(params) {
     var response = '';
     if (!params.file) {
       response = 'Missing JSON file on payload';
@@ -127,7 +131,7 @@ DiscoveryUtils.prototype = {
     return response;
   },
 
-  paramNameCheck: function (params) {
+  paramNameCheck: function(params) {
     var response = '';
     if (!params.name) {
       response = 'Missing Name ';
@@ -135,7 +139,7 @@ DiscoveryUtils.prototype = {
     return response;
   },
 
-  paramDescriptionCheck: function (params) {
+  paramDescriptionCheck: function(params) {
     var response = '';
     if (!params.description) {
       response = 'Missing Description ';
@@ -143,7 +147,7 @@ DiscoveryUtils.prototype = {
     return response;
   },
 
-  paramCollectionCheck: function (params) {
+  paramCollectionCheck: function(params) {
     var response = '';
     if (!params.collection_id) {
       response = 'Missing Collection ID ';
@@ -151,7 +155,7 @@ DiscoveryUtils.prototype = {
     return response;
   },
 
-  paramConfigurationCheck: function (params) {
+  paramConfigurationCheck: function(params) {
     var response = '';
     if (!params.configuration_id) {
       response = 'Missing Configuration ID ';
@@ -184,7 +188,7 @@ DiscoveryUtils.prototype = {
   },
 
   // sorting functions
-  uniqueFilter: function (value, index, self) {
+  uniqueFilter: function(value, index, self) {
     return self.indexOf(value) === index;
   },
 
@@ -194,8 +198,8 @@ DiscoveryUtils.prototype = {
     if ('object' === typeof schemaData) {
       for (var k in schemaData) {
         if ('results' === k &&
-                'object' === typeof schemaData[k] &&
-                'object' === typeof schemaData[k][0]) {
+          'object' === typeof schemaData[k] &&
+          'object' === typeof schemaData[k][0]) {
           fields = this.buildFieldByStep(schemaData[k][0], fields, '');
         }
       }
@@ -206,11 +210,11 @@ DiscoveryUtils.prototype = {
     return fields;
   },
 
-//  reportError: function (node, msg, message) {
-//    var messageTxt = message.error ? message.error : message;
-//    node.status({fill:'red', shape:'dot', text: messageTxt});
-//    node.error(message, msg);
-//  } ,
+  //  reportError: function (node, msg, message) {
+  //    var messageTxt = message.error ? message.error : message;
+  //    node.status({fill:'red', shape:'dot', text: messageTxt});
+  //    node.error(message, msg);
+  //  } ,
 
   isJsonString: function(str) {
     try {
diff --git a/services/discovery/v1-query-builder.html b/services/discovery/v1-query-builder.html
index 089a8a75..0d3a5773 100644
--- a/services/discovery/v1-query-builder.html
+++ b/services/discovery/v1-query-builder.html
@@ -100,6 +100,15 @@
         <input type="hidden" id="node-input-queryvalue3hidden"/>
     </div>
 
+    <div class="form-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-passages" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-passages" style="width: 70%;"> Passages</label>
+    </div>
+    <div>
+        <input type="hidden" id="node-input-passageshidden"/>
+    </div>
+
 </script>
 
 <script type="text/x-red" data-help-name="watson-discovery-v1-query-builder">
@@ -140,7 +149,7 @@
     disQB.query1_selected = $('#node-input-query1hidden').val();
     disQB.query2_selected = $('#node-input-query2hidden').val();
     disQB.query3_selected = $('#node-input-query3hidden').val();
-
+    disQB.passages_selected = $('#node-input-passageshidden').val();
 
     // Nothing is to be shown unless the values to show in the listCollections
     // can be obtained from the service.
@@ -510,6 +519,10 @@
 
       disQB.queryvalue3_selected = $('#node-input-queryvalue3hidden').val();
       $('select#node-input-queryvalue3').val(disQB.queryvalue3_selected);
+
+      disQB.passages_selected = $('#node-input-passageshidden').val();
+      $('inpu#node-input-passages').val(disQB.passages_selected);
+
     }
 
 
@@ -583,6 +596,9 @@
 
       disQB.queryvalue3_selected = $('#node-input-queryvalue3').val();
       $('#node-input-queryvalue3hidden').val(disQB.queryvalue3_selected);
+
+      disQB.passages_selected = $('#node-input-passages').val();
+      $('#node-input-passageshidden').val(disQB.passages_selected);
     }
 
     (function() {
@@ -606,7 +622,9 @@
                 query3: {value: ''},
                 query3hidden: {value: ''},
                 queryvalue3: {value: ''},
-                queryvalue3hidden: {value: ''}
+                queryvalue3hidden: {value: ''},
+                passages: {value: false},
+                passageshidden: {value: false}
             },
             credentials: {
               username: {type:"text"} //,
diff --git a/services/discovery/v1-query-builder.js b/services/discovery/v1-query-builder.js
index ecb1ab4d..4f7c6f57 100644
--- a/services/discovery/v1-query-builder.js
+++ b/services/discovery/v1-query-builder.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  **/
 
-module.exports = function (RED) {
+module.exports = function(RED) {
 
   const SERVICE_IDENTIFIER = 'discovery';
   var pkg = require('../../package.json'),
@@ -32,12 +32,12 @@ module.exports = function (RED) {
     sPassword = dservice.password;
   }
 
-  RED.httpAdmin.get('/watson-discovery-v1-query-builder/vcap', function (req, res) {
+  RED.httpAdmin.get('/watson-discovery-v1-query-builder/vcap', function(req, res) {
     res.json(serviceutils.checkServiceBound(SERVICE_IDENTIFIER));
   });
 
   // API used by widget to fetch available environments
-  RED.httpAdmin.get('/watson-discovery-v1-query-builder/environments', function (req, res) {
+  RED.httpAdmin.get('/watson-discovery-v1-query-builder/environments', function(req, res) {
     var discovery = new DiscoveryV1({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
@@ -47,7 +47,7 @@ module.exports = function (RED) {
       }
     });
 
-    discovery.getEnvironments({}, function (err, response) {
+    discovery.getEnvironments({}, function(err, response) {
       if (err) {
         res.json(err);
       } else {
@@ -57,7 +57,7 @@ module.exports = function (RED) {
   });
 
   // API used by widget to fetch available collections in environment
-  RED.httpAdmin.get('/watson-discovery-v1-query-builder/collections', function (req, res) {
+  RED.httpAdmin.get('/watson-discovery-v1-query-builder/collections', function(req, res) {
     var discovery = new DiscoveryV1({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
@@ -68,8 +68,9 @@ module.exports = function (RED) {
     });
 
     discovery.getCollections({
-      environment_id: req.query.environment_id},
-      function (err, response) {
+      environment_id: req.query.environment_id
+    },
+      function(err, response) {
         if (err) {
           res.json(err);
         } else {
@@ -80,7 +81,7 @@ module.exports = function (RED) {
   });
 
   // API used by widget to fetch available collections in environment
-  RED.httpAdmin.get('/watson-discovery-v1-query-builder/schemas', function (req, res) {
+  RED.httpAdmin.get('/watson-discovery-v1-query-builder/schemas', function(req, res) {
     var discovery = new DiscoveryV1({
       username: sUsername ? sUsername : req.query.un,
       password: sPassword ? sPassword : req.query.pwd,
@@ -93,10 +94,10 @@ module.exports = function (RED) {
     discovery.query({
       environment_id: req.query.environment_id,
       collection_id: req.query.collection_id,
-      //query: 'text:node-red',
       query: 'text:a,text:ibm',
-      count: 1},
-      function (err, response) {
+      count: 1
+    },
+      function(err, response) {
         if (err) {
           res.json(err);
         } else {
@@ -107,11 +108,11 @@ module.exports = function (RED) {
     );
   });
 
-  function Node (config) {
+  function Node(config) {
     var node = this;
     RED.nodes.createNode(this, config);
 
-    this.on('input', function (msg) {
+    this.on('input', function(msg) {
       // Simply return params for query on msg object
       msg.discoveryparams = discoveryutils.buildMsgOverrides(msg, config);
       node.send(msg);
@@ -120,8 +121,12 @@ module.exports = function (RED) {
 
   RED.nodes.registerType('watson-discovery-v1-query-builder', Node, {
     credentials: {
-      username: {type:'text'},
-      password: {type:'password'}
+      username: {
+        type: 'text'
+      },
+      password: {
+        type: 'password'
+      }
     }
   });
 };
diff --git a/services/discovery/v1.html b/services/discovery/v1.html
index a0689faf..35e349b0 100644
--- a/services/discovery/v1.html
+++ b/services/discovery/v1.html
@@ -77,6 +77,13 @@
         <label for="node-input-count"><i class="fa fa-tag"></i> Number of documents</label>
         <input type="text" id="node-input-count" placeholder="">
     </div>
+
+    <div class="form-row">
+        <label>&nbsp;</label>
+        <input type="checkbox" id="node-input-passages" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-passages" style="width: 70%;"> Passages</label>
+    </div>
+
     <div class="form-row">
         <label for="node-input-query"><i class="fa fa-tag"></i> Query for Search</label>
         <input type="text" id="node-input-query" placeholder="">
@@ -230,13 +237,17 @@
             and <code>msg.discoveryparams.collection_id</code>
             </p>
             <p>Optionally you can specify the number of documents to retrieve, a
-               query to find the most relevant search results, a filter
-               to limit the search results an aggregation to return an
+               query to find the most relevant search results, whether to
+               retrieve the most relevant passages,
+               to limit the search results, an aggregation to return an
                exact result, and a comma separated list of the sections of the
                documents to return.</p>
             <p>The query being submitted can be overridden by specifying the
             query in <code>msg.discoveryparams.query</code>.
             </p>
+            <p>The passages parameter can be overridden by specifying
+            <code>msg.discoveryparams.passages</code>.
+            </p>
             <p>Node output : </p>
               <ul>
                 <li><code>msg.search_results</code> : Details of the requested collection.</li>
@@ -267,6 +278,7 @@
       $('#node-input-configurationname').parent().hide();
       $('#node-input-configuration_id').parent().hide();
       $('#node-input-count').parent().hide();
+      $('#node-input-passages').parent().hide();
       $('#node-input-query').parent().hide();
       $('#node-input-filter').parent().hide();
       $('#node-input-aggregation').parent().hide();
@@ -320,6 +332,7 @@
           fields.push('#node-input-environment_id'
                          + ', #node-input-collection_id'
                          + ', #node-input-count'
+                         + ', #node-input-passages'
                          + ', #node-input-query'
                          + ', #node-input-filter'
                          + ', #node-input-aggregation'
@@ -367,6 +380,7 @@
                 configuration_id: {value: ""},
                 collection_name: {value: ""},
                 count: {value: "1"},
+                passages: {value: "false"},
                 query: {value: ""},
                 filter: {value: ""},
                 aggregation: {value: ""},
diff --git a/services/visual_recognition/v3.js b/services/visual_recognition/v3.js
index a15b42cb..8d09787f 100644
--- a/services/visual_recognition/v3.js
+++ b/services/visual_recognition/v3.js
@@ -19,6 +19,7 @@ module.exports = function(RED) {
   const VisualRecognitionV3 = require('watson-developer-cloud/visual-recognition/v3');
   var pkg = require('../../package.json'),
     serviceutils = require('../../utilities/service-utils'),
+    payloadutils = require('../../utilities/payload-utils'),
     //watson = require('watson-developer-cloud'),
     imageType = require('image-type'),
     url = require('url'),
@@ -26,6 +27,7 @@ module.exports = function(RED) {
     fileType = require('file-type'),
     fs = require('fs'),
     async = require('async'),
+    toArray = require('stream-to-array'),
     sAPIKey = null,
     service = null;
 
@@ -75,7 +77,8 @@ module.exports = function(RED) {
     case 'classifyImage':
     case 'detectFaces':
     case 'recognizeText':
-      if (typeof msg.payload === 'boolean' || typeof msg.payload === 'number') {
+      if (typeof msg.payload === 'boolean' ||
+        typeof msg.payload === 'number') {
         return Promise.reject('Bad format : msg.payload must be a URL string or a Node.js Buffer');
       }
       break;
@@ -83,6 +86,32 @@ module.exports = function(RED) {
     return Promise.resolve();
   }
 
+
+  // Even though Visual Reconition SDK can accept a filestream as input
+  // it can't handle the one on msg.payload, so read it into a buffer
+  function checkForStream(msg) {
+    var p = new Promise(function resolver(resolve, reject) {
+      if (payloadutils.isReadableStream(msg.payload)) {
+        //msg.payload.resume();
+        toArray(msg.payload)
+          .then(function(parts) {
+            var buffers = [], part = null;
+
+            for (var i = 0; i < parts.length; ++i) {
+              part = parts[i];
+              buffers.push((part instanceof Buffer) ? part : new Buffer(part));
+            }
+            msg.payload = Buffer.concat(buffers);
+            resolve();
+          });
+      } else {
+        resolve();
+      }
+    });
+    return p;
+
+  }
+
   function verifyServiceCredentials(node, msg) {
     // If it is present the newly provided user entered key
     // takes precedence over the existing one.
@@ -118,8 +147,26 @@ module.exports = function(RED) {
     }
   }
 
+  function setCommonParams(node, msg, params) {
+    if (msg.params != null && msg.params.classifier_ids != null) {
+      params['classifier_ids'] = msg.params['classifier_ids'];
+    }
+    if (msg.params != null && msg.params.owners != null) {
+      params['owners'] = msg.params['owners'];
+    }
+    if (msg.params != null && msg.params.threshold != null) {
+      params['threshold'] = msg.params['threshold'];
+    }
+    if (node.config != null && node.config.lang != null) {
+      params['Accept-Language'] = node.config.lang;
+    }
+    if (msg.params != null && msg.params.accept_language != null) {
+      params['Accept-Language'] = msg.params['accept_language'];
+    }
+  }
+
   function prepareCommonParams(params, node, msg) {
-    var p = new Promise(function resolver(resolve, reject){
+    var p = new Promise(function resolver(resolve, reject) {
       if (imageCheck(msg.payload)) {
         var ft = fileType(msg.payload);
         var ext = ft ? ft.ext : 'tmp';
@@ -131,41 +178,13 @@ module.exports = function(RED) {
           }
           stream_buffer(info.path, msg.payload, function() {
             params['images_file'] = fs.createReadStream(info.path);
-            if (msg.params != null && msg.params.classifier_ids != null) {
-              params['classifier_ids'] = msg.params['classifier_ids'];
-            }
-            if (msg.params != null && msg.params.owners != null) {
-              params['owners'] = msg.params['owners'];
-            }
-            if (msg.params != null && msg.params.threshold != null) {
-              params['threshold'] = msg.params['threshold'];
-            }
-            if (node.config != null && node.config.lang != null) {
-              params['Accept-Language'] = node.config.lang;
-            }
-            if (msg.params != null && msg.params.accept_language != null) {
-              params['Accept-Language'] = msg.params['accept_language'];
-            }
+            setCommonParams(node, msg, params);
             resolve();
           });
         });
       } else if (urlCheck(msg.payload)) {
         params['url'] = msg.payload;
-        if (msg.params != null && msg.params.classifier_ids != null) {
-          params['classifier_ids'] = msg.params['classifier_ids'];
-        }
-        if (msg.params != null && msg.params.owners != null) {
-          params['owners'] = msg.params['owners'];
-        }
-        if (msg.params != null && msg.params.threshold != null) {
-          params['threshold'] = msg.params['threshold'];
-        }
-        if (node.config != null && node.config.lang != null) {
-          params['Accept-Language'] = node.config.lang;
-        }
-        if (msg.params != null && msg.params.accept_language != null) {
-          params['Accept-Language'] = msg.params['accept_language'];
-        }
+        setCommonParams(node, msg, params);
         resolve();
       } else {
         reject('Payload must be either an image buffer or a string representing a url');
@@ -216,7 +235,7 @@ module.exports = function(RED) {
   // that contains a minimum of 10 images.(Optional)
 
   function prepareParamsCreateClassifier(params, node, msg) {
-    var p = new Promise(function resolver(resolve, reject){
+    var p = new Promise(function resolver(resolve, reject) {
       var listParams = {},
         asyncTasks = [],
         k = null;
@@ -246,7 +265,7 @@ module.exports = function(RED) {
   }
 
   function performDeleteAllClassifiers(params, node, msg) {
-    var p = new Promise(function resolver(resolve, reject){
+    var p = new Promise(function resolver(resolve, reject) {
       node.service.listClassifiers(params, function(err, body) {
         node.status({});
         if (err) {
@@ -288,7 +307,7 @@ module.exports = function(RED) {
   }
 
   function invokeService(feature, params, node, msg) {
-    var p = new Promise(function resolver(resolve, reject){
+    var p = new Promise(function resolver(resolve, reject) {
       switch (feature) {
       case 'classifyImage':
         node.service.classify(params, function(err, body) {
@@ -324,17 +343,17 @@ module.exports = function(RED) {
 
   function executeService(feature, params, node, msg) {
     var p = prepareCommonParams(params, node, msg)
-      .then(function(){
+      .then(function() {
         return invokeService(feature, params, node, msg);
       })
-      .then(function(body){
+      .then(function(body) {
         return processTheResponse(body, feature, node, msg);
       });
     return p;
   }
 
   function invokeCreateClassifier(node, params) {
-    var p = new Promise(function resolver(resolve, reject){
+    var p = new Promise(function resolver(resolve, reject) {
       node.service.createClassifier(params, function(err, body) {
         if (err) {
           reject(err);
@@ -348,7 +367,7 @@ module.exports = function(RED) {
   }
 
   function invokeListClassifiers(node, params) {
-    var p = new Promise(function resolver(resolve, reject){
+    var p = new Promise(function resolver(resolve, reject) {
       node.service.listClassifiers(params, function(err, body) {
         if (err) {
           reject(err);
@@ -361,7 +380,7 @@ module.exports = function(RED) {
   }
 
   function invokeGetClassifier(node, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
+    var p = new Promise(function resolver(resolve, reject) {
       params['classifier_id'] = msg.params['classifier_id'];
       node.service.getClassifier(params, function(err, body) {
         if (err) {
@@ -375,7 +394,7 @@ module.exports = function(RED) {
   }
 
   function invokeDeleteClassifier(node, params, msg) {
-    var p = new Promise(function resolver(resolve, reject){
+    var p = new Promise(function resolver(resolve, reject) {
       params['classifier_id'] = msg.params['classifier_id'];
       node.service.deleteClassifier(params, function(err, body) {
         if (err) {
@@ -391,7 +410,7 @@ module.exports = function(RED) {
 
   function executeCreateClassifier(params, node, msg) {
     var p = prepareParamsCreateClassifier(params, node, msg)
-      .then(function(){
+      .then(function() {
         return invokeCreateClassifier(node, params);
       });
 
@@ -403,28 +422,28 @@ module.exports = function(RED) {
     switch (feature) {
     case 'createClassifier':
       p = executeCreateClassifier(params, node, msg)
-        .then(function(body){
+        .then(function(body) {
           return processTheResponse(body, feature, node, msg);
         });
       break;
 
     case 'retrieveClassifiersList':
       p = invokeListClassifiers(node, params)
-        .then(function(body){
+        .then(function(body) {
           return processTheResponse(body, feature, node, msg);
         });
       break;
 
     case 'retrieveClassifierDetails':
       p = invokeGetClassifier(node, params, msg)
-        .then(function(body){
+        .then(function(body) {
           return processTheResponse(body, feature, node, msg);
         });
       break;
 
     case 'deleteClassifier':
       p = invokeDeleteClassifier(node, params, msg)
-        .then(function(body){
+        .then(function(body) {
           return processTheResponse(body, feature, node, msg);
         });
       break;
@@ -466,44 +485,35 @@ module.exports = function(RED) {
       var params = {};
 
       node.status({});
-      // so there is at most 1 temp file at a time (did not found a better solution...)
-      //temp.cleanup();
 
       verifyPayload(msg)
-        .then(function(){
+        .then(function() {
+          return checkForStream(msg);
+        })
+        .then(function() {
           return verifyInputs(feature, msg);
         })
-        .then(function(){
+        .then(function() {
           return verifyServiceCredentials(node, msg);
         })
-        .then(function(){
+        .then(function() {
           return execute(feature, params, node, msg);
         })
-        .then(function(){
+        .then(function() {
           temp.cleanup();
           node.status({});
           node.send(msg);
         })
         .catch(function(err) {
-          var messageTxt = err;
-          if (err.error) {
-            messageTxt = err.error;
-          } else if (err.description) {
-            messageTxt = err.description;
-          }
-          node.status({
-            fill: 'red',
-            shape: 'dot',
-            text: messageTxt
-          });
+          payloadutils.reportError(node, msg, err);
 
           msg.result = {};
           msg.result['error'] = err;
-          node.error(messageTxt, msg);
           // Note: This node.send forwards the error to the next node,
           // if this isn't desired then this line needs to be removed.
           // Should be ok as the node.error would already have recorded
           // the error in the debug console.
+          temp.cleanup();
           node.send(msg);
         });
     });
diff --git a/utilities/payload-utils.js b/utilities/payload-utils.js
index 4c7ce480..72b3d510 100644
--- a/utilities/payload-utils.js
+++ b/utilities/payload-utils.js
@@ -17,7 +17,8 @@ var url = require('url'),
   fs = require('fs'),
   fileType = require('file-type'),
   request = require('request'),
-  path = require('path');
+  path = require('path'),
+  stream = require('stream');
 
 function PayloadUtils() {}
 
@@ -89,15 +90,28 @@ PayloadUtils.prototype = {
     request(url).pipe(wstream);
   },
 
-  reportError: function (node, msg, message) {
-    var messageTxt = message.error ? message.error : message;
+  reportError: function (node, msg, err) {
+    var messageTxt = err;
 
-    msg.watsonerror = messageTxt;
+    if (err.error) {
+      messageTxt = err.error;
+    } else if (err.description) {
+      messageTxt = err.description;
+    } else if (err.message) {
+      messageTxt = err.message;
+    }
 
+    msg.watsonerror = messageTxt;
     node.status({fill:'red', shape:'dot', text: messageTxt});
     node.error(messageTxt, msg);
   },
 
+  isReadableStream : function (obj) {
+    return obj instanceof stream.Stream &&
+        typeof (obj._read === 'function') &&
+        typeof (obj._readableState === 'object');
+  },
+
   // Function that is returns a function to count
   // the characters in each language.
   word_count: function(ct) {