diff --git a/nodes/core/core/80-function.js b/nodes/core/core/80-function.js
index 2d5f7901a..ba52f2ff6 100644
--- a/nodes/core/core/80-function.js
+++ b/nodes/core/core/80-function.js
@@ -205,7 +205,7 @@ module.exports = function(RED) {
         var context = vm.createContext(sandbox);
         try {
             this.script = vm.createScript(functionText, {
-                filename: this.name + '_' + this.id, // filename for stack traces
+                filename: 'Function Node:'+this.id+(this.name?' ['+this.name+']':'', // filename for stack traces
                 lineOffset: -11, // line number offset to be used for stack traces
                 columnOffset: 0, // column number offset to be used for stack traces
                 displayErrors: true
@@ -227,7 +227,6 @@ module.exports = function(RED) {
                     //remove unwanted part 
                     const index = err.stack.search(/\n\s*at ContextifyScript.Script.runInContext/);
                     err.stack = err.stack.slice(0, index).split('\n').slice(0,-1).join('\n');
-                    console.log(index, err.stack);
                     const stack = err.stack.split(/\r?\n/);
 
                     //store the error in msg to be used in flows