diff --git a/lib/plugins/create/templates/azure-nodejs/handler.js b/lib/plugins/create/templates/azure-nodejs/handler.js
index fda49bb47..a7ec9b971 100644
--- a/lib/plugins/create/templates/azure-nodejs/handler.js
+++ b/lib/plugins/create/templates/azure-nodejs/handler.js
@@ -1,10 +1,19 @@
 'use strict';
 
 module.exports.hello = function (context, req) {
-  // Add any necessary telemetry to support diagnosing your function
-  context.log('HTTP trigger occured!');
+  context.log('JavaScript HTTP trigger function processed a request.');
 
-  // Read properties from the incoming request, and respond as appropriate.
-  const name = req.query.name || (req.body && req.body.name) || 'World';
-  context.done(null, { body: `Hello ${name}` });
+    if (req.query.name || (req.body && req.body.name)) {
+        context.res = {
+            // status: 200, /* Defaults to 200 */
+            body: "Hello " + (req.query.name || req.body.name)
+        };
+    }
+    else {
+        context.res = {
+            status: 400,
+            body: "Please pass a name on the query string or in the request body"
+        };
+    }
+    context.done();
 };