diff --git a/microscript/ILibDuktape_Helpers.c b/microscript/ILibDuktape_Helpers.c
index c383314..be4f5aa 100644
--- a/microscript/ILibDuktape_Helpers.c
+++ b/microscript/ILibDuktape_Helpers.c
@@ -37,6 +37,8 @@ struct sockaddr_in6 duktape_internalAddress;
 #define ILibDuktape_Process_ExitCode						"\xFF_ExitCode"
 #define ILibDuktape_Memory_AllocTable						"\xFF_MemoryAllocTable"
 #define ILibDuktape_ObjectStashKey							"\xFF_ObjectStashKey"
+#define ILibDuktape_UncaughtException_NativeHandler			"\xFF_UncaughtNativeHandler"
+#define ILibDuktape_UncaughtException_NativeUser			"\xFF_UncaughtNativeUser"
 
 int ILibDuktape_GetReferenceCount(duk_context *ctx, duk_idx_t i)
 {
@@ -442,13 +444,36 @@ void *ILibDuktape_GetProcessObject(duk_context *ctx)
 	duk_pop(ctx);									// ...
 	return retVal;
 }
+duk_ret_t ILibDuktape_SetNativeUncaughtExceptionSink(duk_context *ctx)
+{
+	duk_push_current_function(ctx);
+	ILibDuktape_NativeUncaughtExceptionHandler handler = (ILibDuktape_NativeUncaughtExceptionHandler)Duktape_GetPointerProperty(ctx, -1, ILibDuktape_UncaughtException_NativeHandler);
+	void *user = Duktape_GetPointerProperty(ctx, -1, ILibDuktape_UncaughtException_NativeUser);
 
+	if (handler != NULL)
+	{
+		handler(ctx, (char*)duk_safe_to_string(ctx, 0), user);
+	}
+	return(0);
+}
 void ILibDuktape_SetNativeUncaughtExceptionHandler(duk_context * ctx, ILibDuktape_NativeUncaughtExceptionHandler handler, void * user)
 {
 	void *j = ILibDuktape_GetProcessObject(ctx);
 	
 	if (j != NULL)
 	{
+		duk_push_heapptr(ctx, j);															// [process]
+		duk_get_prop_string(ctx, -1, "on");													// [process][on]
+		duk_swap_top(ctx, -2);																// [on][this]
+		duk_push_string(ctx, "uncaughtException");											// [on][this][exception]
+		duk_push_c_function(ctx, ILibDuktape_SetNativeUncaughtExceptionSink, DUK_VARARGS);	// [on][this][exception][func]
+		duk_push_pointer(ctx, handler);														// [on][this][exception][func][handler]
+		duk_put_prop_string(ctx, -2, ILibDuktape_UncaughtException_NativeHandler);			// [on][this][exception][func]
+		duk_push_pointer(ctx, user);
+		duk_put_prop_string(ctx, -2, ILibDuktape_UncaughtException_NativeUser);				// [on][this][exception][func]
+		duk_pcall_method(ctx, 2); duk_pop(ctx);												// ...
+
+		// This is only used when we dump the core, so we can re-set these events
 		duk_push_heapptr(ctx, j);													// [process]
 		duk_push_pointer(ctx, handler);												// [process][handler]
 		duk_put_prop_string(ctx, -2, ILibDuktape_NativeUncaughtExceptionPtr);		// [process]
@@ -489,19 +514,6 @@ void ILibDuktape_Process_UncaughtExceptionEx(duk_context *ctx, char *format, ...
 		len += sprintf_s(dest + len, sizeof(dest) - len, " => %s", errmsg);
 	}
 
-	if (j != NULL)
-	{
-		duk_push_heapptr(ctx, j);														// [process]
-		if (duk_has_prop_string(ctx, -1, ILibDuktape_NativeUncaughtExceptionPtr))
-		{
-			duk_get_prop_string(ctx, -1, ILibDuktape_NativeUncaughtExceptionPtr);		// [process][ptr]
-			duk_get_prop_string(ctx, -2, ILibDuktape_NativeUncaughtExceptionUserPtr);	// [process][ptr][user]
-			((ILibDuktape_NativeUncaughtExceptionHandler)duk_get_pointer(ctx, -2))(ctx, (char*)dest, duk_get_pointer(ctx, -1));
-			duk_pop_2(ctx);																// [process]
-		}
-		duk_pop(ctx);																	// ...
-	}
-
 	if (emitter != NULL)
 	{
 		duk_push_heapptr(emitter->ctx, emitter->object);								// [process]
diff --git a/microscript/ILibDuktape_Polyfills.c b/microscript/ILibDuktape_Polyfills.c
index 5fc97c3..736dacd 100644
--- a/microscript/ILibDuktape_Polyfills.c
+++ b/microscript/ILibDuktape_Polyfills.c
@@ -20,7 +20,7 @@ limitations under the License.
 #include "ILibDuktape_DuplexStream.h"
 #include "ILibDuktape_EventEmitter.h"
 #include "ILibDuktape_Debugger.h"
-#include "../microstack/ILibParsers.h"
+#include "../microstack/ILibParsers.h"duk_peval_string_noresult(ctx, "addModule('promise', Buffer.from('/*
Copyright 2018 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

var refTable = {};

function event_switcher_helper(desired_callee, target, forward)
{
    this._ObjectID = 'event_switcher';
    this.func = function func()
    {
        var args = [];
        if (func.forward != null) { args.push(func.forward); }
        for(var i in arguments)
        {
            args.push(arguments[i]);
        }
        return (func.target.apply(func.desired, args));
    };
    this.func.desired = desired_callee;
    this.func.target = target;
    this.func.forward = forward;
    this.func.self = this;
}
function event_switcher(desired_callee, target)
{
    return (new event_switcher_helper(desired_callee, target));
}

function event_forwarder(sourceObj, sourceName, targetObj, targetName)
{
    sourceObj.on(sourceName,   (new event_switcher_helper(targetObj, targetObj.emit, targetName)).func);      
}

function Promise(promiseFunc)
{
    this._ObjectID = 'promise';
    this.promise = this;
    this._internal = { _ObjectID: 'promise.internal', promise: this, func: promiseFunc, completed: false, errors: false, completedArgs: [] };
    require('events').EventEmitter.call(this._internal);
    this._internal.on('newListener', function (eventName, eventCallback)
    {
        //console.log('newListener', eventName, 'errors/' + this.errors + ' completed/' + this.completed);
        var r = null;

        if (eventName == 'resolved' && !this.errors && this.completed)
        {
            r = eventCallback.apply(this, this.completedArgs);
            if(r!=null)
            {
                this.emit_returnValue('resolved', r);
            }
        }
        if (eventName == 'rejected' && this.errors && this.completed)
        {
            eventCallback.apply(this, this.completedArgs);
        }
        if (eventName == 'settled' && this.completed)
        {
            eventCallback.apply(this, []);
        }
    });
    this._internal.resolver = function _resolver()
    {
        if (_resolver._self.completed) { return; }
        _resolver._self.errors = false;
        _resolver._self.completed = true;
        _resolver._self.completedArgs = [];
        var args = ['resolved'];
        if (this.emit_returnValue && this.emit_returnValue('resolved') != null)
        {
            _resolver._self.completedArgs.push(this.emit_returnValue('resolved'));
            args.push(this.emit_returnValue('resolved'));
        }
        else
        {
            for (var a in arguments)
            {
                _resolver._self.completedArgs.push(arguments[a]);
                args.push(arguments[a]);
            }
        }
        _resolver._self.emit.apply(_resolver._self, args);
        _resolver._self.emit('settled');
    };
    this._internal.rejector = function _rejector()
    {
        if (_rejector._self.completed) { return; }
        _rejector._self.errors = true;
        _rejector._self.completed = true;
        _rejector._self.completedArgs = [];
        var args = ['rejected'];
        for (var a in arguments)
        {
            _rejector._self.completedArgs.push(arguments[a]);
            args.push(arguments[a]);
        }

        _rejector._self.emit.apply(_rejector._self, args);
        _rejector._self.emit('settled');
    };
    this.catch = function(func)
    {
        this._internal.once('rejected', event_switcher(this, func).func);
    }
    this.finally = function (func)
    {
        this._internal.once('settled', event_switcher(this, func).func);
    };
    this.then = function (resolved, rejected)
    {
        if (resolved) { this._internal.once('resolved', event_switcher(this, resolved).func); }
        if (rejected)
        {
            this._internal.once('rejected', event_switcher(this, rejected).func);
        }
        else
        {
            this._internal.once('rejected', function (e) { process.emit('uncaughtException', 'promise.unhandledRejection: ' + e); });
        }
                      
        var retVal = new Promise(function (r, j) { });
        this._internal.once('resolved', retVal._internal.resolver);
        this._internal.once('rejected', retVal._internal.rejector);
        retVal.parentPromise = this;
        return (retVal);
    };

    this._internal.resolver._self = this._internal;
    this._internal.rejector._self = this._internal;;

    try
    {
        promiseFunc.call(this, this._internal.resolver, this._internal.rejector);
    }
    catch(e)
    {
        this._internal.errors = true;
        this._internal.completed = true;
        this._internal.completedArgs = [e];
        this._internal.emit('rejected', e);
        this._internal.emit('settled');
    }

    if(!this._internal.completed)
    {
        // Save reference of this object
        refTable[this._internal._hashCode()] = this._internal;
        this._internal.once('settled', function () { refTable[this._hashCode()] = null; });
    }
}

Promise.resolve = function resolve()
{
    var retVal = new Promise(function (r, j) { });
    var args = [];
    for (var i in arguments)
    {
        args.push(arguments[i]);
    }
    retVal._internal.resolver.apply(retVal._internal, args);
    return (retVal);
};
Promise.reject = function reject() {
    var retVal = new Promise(function (r, j) { });
    var args = [];
    for (var i in arguments) {
        args.push(arguments[i]);
    }
    retVal._internal.rejector.apply(retVal._internal, args);
    return (retVal);
};
Promise.all = function all(promiseList)
{
    var ret = new Promise(function (res, rej)
    {
        this.__rejector = rej;
        this.__resolver = res;
        this.__promiseList = promiseList;
        this.__done = false;
        this.__count = 0;
    });

    for (var i in promiseList)
    {
        promiseList[i].then(function ()
        {
            // Success
            if(++ret.__count == ret.__promiseList.length)
            {
                ret.__done = true;
                ret.__resolver(ret.__promiseList);
            }
        }, function (arg)
        {
            // Failure
            if(!ret.__done)
            {
                ret.__done = true;
                ret.__rejector(arg);
            }
        });
    }
    if (promiseList.length == 0)
    {
        ret.__resolver(promiseList);
    }
    return (ret);
};

module.exports = Promise;
module.exports.event_switcher = event_switcher;
module.exports.event_forwarder = event_forwarder;', 'base64').toString());");
 #include "../microstack/ILibCrypto.h"
 #include "../microstack/ILibRemoteLogging.h"
 
@@ -2031,7 +2031,7 @@ void ILibDuktape_Polyfills_JS_Init(duk_context *ctx)
 	free(_clipboard);
 
 	// Promise: This is very important, as it is used everywhere. Refer to /modules/promise.js to see a human readable version of promise.js
-	duk_peval_string_noresult(ctx, "addModule('promise', Buffer.from('/*
Copyright 2018 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

var refTable = {};

function event_switcher_helper(desired_callee, target, forward)
{
    this._ObjectID = 'event_switcher';
    this.func = function func()
    {
        var args = [];
        if (func.forward != null) { args.push(func.forward); }
        for(var i in arguments)
        {
            args.push(arguments[i]);
        }
        return (func.target.apply(func.desired, args));
    };
    this.func.desired = desired_callee;
    this.func.target = target;
    this.func.forward = forward;
    this.func.self = this;
}
function event_switcher(desired_callee, target)
{
    return (new event_switcher_helper(desired_callee, target));
}

function event_forwarder(sourceObj, sourceName, targetObj, targetName)
{
    sourceObj.on(sourceName,   (new event_switcher_helper(targetObj, targetObj.emit, targetName)).func);      
}

function Promise(promiseFunc)
{
    this._ObjectID = 'promise';
    this.promise = this;
    this._internal = { _ObjectID: 'promise.internal', promise: this, func: promiseFunc, completed: false, errors: false, completedArgs: [] };
    require('events').EventEmitter.call(this._internal);
    this._internal.on('newListener', function (eventName, eventCallback)
    {
        //console.log('newListener', eventName, 'errors/' + this.errors + ' completed/' + this.completed);
        var r = null;

        if (eventName == 'resolved' && !this.errors && this.completed)
        {
            r = eventCallback.apply(this, this.completedArgs);
            if(r!=null)
            {
                this.emit_returnValue('resolved', r);
            }
        }
        if (eventName == 'rejected' && this.errors && this.completed)
        {
            eventCallback.apply(this, this.completedArgs);
        }
        if (eventName == 'settled' && this.completed)
        {
            eventCallback.apply(this, []);
        }
    });
    this._internal.resolver = function _resolver()
    {
        if (_resolver._self.completed) { return; }
        _resolver._self.errors = false;
        _resolver._self.completed = true;
        _resolver._self.completedArgs = [];
        var args = ['resolved'];
        if (this.emit_returnValue && this.emit_returnValue('resolved') != null)
        {
            _resolver._self.completedArgs.push(this.emit_returnValue('resolved'));
            args.push(this.emit_returnValue('resolved'));
        }
        else
        {
            for (var a in arguments)
            {
                _resolver._self.completedArgs.push(arguments[a]);
                args.push(arguments[a]);
            }
        }
        _resolver._self.emit.apply(_resolver._self, args);
        _resolver._self.emit('settled');
    };
    this._internal.rejector = function _rejector()
    {
        if (_rejector._self.completed) { return; }
        _rejector._self.errors = true;
        _rejector._self.completed = true;
        _rejector._self.completedArgs = [];
        var args = ['rejected'];
        for (var a in arguments)
        {
            _rejector._self.completedArgs.push(arguments[a]);
            args.push(arguments[a]);
        }

        _rejector._self.emit.apply(_rejector._self, args);
        _rejector._self.emit('settled');
    };
    this.catch = function(func)
    {
        this._internal.once('rejected', event_switcher(this, func).func);
    }
    this.finally = function (func)
    {
        this._internal.once('settled', event_switcher(this, func).func);
    };
    this.then = function (resolved, rejected)
    {
        if (resolved) { this._internal.once('resolved', event_switcher(this, resolved).func); }
        if (rejected) { this._internal.once('rejected', event_switcher(this, rejected).func); }

        var retVal = new Promise(function (r, j) { });
        this._internal.once('resolved', retVal._internal.resolver);
        this._internal.once('rejected', retVal._internal.rejector);
        retVal.parentPromise = this;
        return (retVal);
    };

    this._internal.resolver._self = this._internal;
    this._internal.rejector._self = this._internal;;

    try
    {
        promiseFunc.call(this, this._internal.resolver, this._internal.rejector);
    }
    catch(e)
    {
        this._internal.errors = true;
        this._internal.completed = true;
        this._internal.completedArgs = [e];
        this._internal.emit('rejected', e);
        this._internal.emit('settled');
    }

    if(!this._internal.completed)
    {
        // Save reference of this object
        refTable[this._internal._hashCode()] = this._internal;
        this._internal.once('settled', function () { refTable[this._hashCode()] = null; });
    }
}

Promise.resolve = function resolve()
{
    var retVal = new Promise(function (r, j) { });
    var args = [];
    for (var i in arguments)
    {
        args.push(arguments[i]);
    }
    retVal._internal.resolver.apply(retVal._internal, args);
    return (retVal);
};
Promise.reject = function reject() {
    var retVal = new Promise(function (r, j) { });
    var args = [];
    for (var i in arguments) {
        args.push(arguments[i]);
    }
    retVal._internal.rejector.apply(retVal._internal, args);
    return (retVal);
};
Promise.all = function all(promiseList)
{
    var ret = new Promise(function (res, rej)
    {
        this.__rejector = rej;
        this.__resolver = res;
        this.__promiseList = promiseList;
        this.__done = false;
        this.__count = 0;
    });

    for (var i in promiseList)
    {
        promiseList[i].then(function ()
        {
            // Success
            if(++ret.__count == ret.__promiseList.length)
            {
                ret.__done = true;
                ret.__resolver(ret.__promiseList);
            }
        }, function (arg)
        {
            // Failure
            if(!ret.__done)
            {
                ret.__done = true;
                ret.__rejector(arg);
            }
        });
    }
    if (promiseList.length == 0)
    {
        ret.__resolver(promiseList);
    }
    return (ret);
};

module.exports = Promise;
module.exports.event_switcher = event_switcher;
module.exports.event_forwarder = event_forwarder;', 'base64').toString());");
+	duk_peval_string_noresult(ctx, "addModule('promise', Buffer.from('/*
Copyright 2018 Intel Corporation

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

    http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

var refTable = {};

function event_switcher_helper(desired_callee, target, forward)
{
    this._ObjectID = 'event_switcher';
    this.func = function func()
    {
        var args = [];
        if (func.forward != null) { args.push(func.forward); }
        for(var i in arguments)
        {
            args.push(arguments[i]);
        }
        return (func.target.apply(func.desired, args));
    };
    this.func.desired = desired_callee;
    this.func.target = target;
    this.func.forward = forward;
    this.func.self = this;
}
function event_switcher(desired_callee, target)
{
    return (new event_switcher_helper(desired_callee, target));
}

function event_forwarder(sourceObj, sourceName, targetObj, targetName)
{
    sourceObj.on(sourceName,   (new event_switcher_helper(targetObj, targetObj.emit, targetName)).func);      
}

function Promise(promiseFunc)
{
    this._ObjectID = 'promise';
    this.promise = this;
    this._internal = { _ObjectID: 'promise.internal', promise: this, func: promiseFunc, completed: false, errors: false, completedArgs: [] };
    require('events').EventEmitter.call(this._internal);
    this._internal.on('newListener', function (eventName, eventCallback)
    {
        //console.log('newListener', eventName, 'errors/' + this.errors + ' completed/' + this.completed);
        var r = null;

        if (eventName == 'resolved' && !this.errors && this.completed)
        {
            r = eventCallback.apply(this, this.completedArgs);
            if(r!=null)
            {
                this.emit_returnValue('resolved', r);
            }
        }
        if (eventName == 'rejected' && this.errors && this.completed)
        {
            eventCallback.apply(this, this.completedArgs);
        }
        if (eventName == 'settled' && this.completed)
        {
            eventCallback.apply(this, []);
        }
    });
    this._internal.resolver = function _resolver()
    {
        if (_resolver._self.completed) { return; }
        _resolver._self.errors = false;
        _resolver._self.completed = true;
        _resolver._self.completedArgs = [];
        var args = ['resolved'];
        if (this.emit_returnValue && this.emit_returnValue('resolved') != null)
        {
            _resolver._self.completedArgs.push(this.emit_returnValue('resolved'));
            args.push(this.emit_returnValue('resolved'));
        }
        else
        {
            for (var a in arguments)
            {
                _resolver._self.completedArgs.push(arguments[a]);
                args.push(arguments[a]);
            }
        }
        _resolver._self.emit.apply(_resolver._self, args);
        _resolver._self.emit('settled');
    };
    this._internal.rejector = function _rejector()
    {
        if (_rejector._self.completed) { return; }
        _rejector._self.errors = true;
        _rejector._self.completed = true;
        _rejector._self.completedArgs = [];
        var args = ['rejected'];
        for (var a in arguments)
        {
            _rejector._self.completedArgs.push(arguments[a]);
            args.push(arguments[a]);
        }

        _rejector._self.emit.apply(_rejector._self, args);
        _rejector._self.emit('settled');
    };
    this.catch = function(func)
    {
        this._internal.once('rejected', event_switcher(this, func).func);
    }
    this.finally = function (func)
    {
        this._internal.once('settled', event_switcher(this, func).func);
    };
    this.then = function (resolved, rejected)
    {
        if (resolved) { this._internal.once('resolved', event_switcher(this, resolved).func); }
        if (rejected)
        {
            this._internal.once('rejected', event_switcher(this, rejected).func);
        }
        else
        {
            this._internal.once('rejected', function (e) { process.emit('uncaughtException', 'promise.unhandledRejection: ' + e); });
        }
                      
        var retVal = new Promise(function (r, j) { });
        this._internal.once('resolved', retVal._internal.resolver);
        this._internal.once('rejected', retVal._internal.rejector);
        retVal.parentPromise = this;
        return (retVal);
    };

    this._internal.resolver._self = this._internal;
    this._internal.rejector._self = this._internal;;

    try
    {
        promiseFunc.call(this, this._internal.resolver, this._internal.rejector);
    }
    catch(e)
    {
        this._internal.errors = true;
        this._internal.completed = true;
        this._internal.completedArgs = [e];
        this._internal.emit('rejected', e);
        this._internal.emit('settled');
    }

    if(!this._internal.completed)
    {
        // Save reference of this object
        refTable[this._internal._hashCode()] = this._internal;
        this._internal.once('settled', function () { refTable[this._hashCode()] = null; });
    }
}

Promise.resolve = function resolve()
{
    var retVal = new Promise(function (r, j) { });
    var args = [];
    for (var i in arguments)
    {
        args.push(arguments[i]);
    }
    retVal._internal.resolver.apply(retVal._internal, args);
    return (retVal);
};
Promise.reject = function reject() {
    var retVal = new Promise(function (r, j) { });
    var args = [];
    for (var i in arguments) {
        args.push(arguments[i]);
    }
    retVal._internal.rejector.apply(retVal._internal, args);
    return (retVal);
};
Promise.all = function all(promiseList)
{
    var ret = new Promise(function (res, rej)
    {
        this.__rejector = rej;
        this.__resolver = res;
        this.__promiseList = promiseList;
        this.__done = false;
        this.__count = 0;
    });

    for (var i in promiseList)
    {
        promiseList[i].then(function ()
        {
            // Success
            if(++ret.__count == ret.__promiseList.length)
            {
                ret.__done = true;
                ret.__resolver(ret.__promiseList);
            }
        }, function (arg)
        {
            // Failure
            if(!ret.__done)
            {
                ret.__done = true;
                ret.__rejector(arg);
            }
        });
    }
    if (promiseList.length == 0)
    {
        ret.__resolver(promiseList);
    }
    return (ret);
};

module.exports = Promise;
module.exports.event_switcher = event_switcher;
module.exports.event_forwarder = event_forwarder;', 'base64').toString());");
 
 #ifdef WIN32
 	// Adding win-registry, since it is very useful for windows... Refer to /modules/win-registry.js to see a human readable version
diff --git a/modules/promise.js b/modules/promise.js
index 9b5272d..6f0c614 100644
--- a/modules/promise.js
+++ b/modules/promise.js
@@ -122,8 +122,15 @@ function Promise(promiseFunc)
     this.then = function (resolved, rejected)
     {
         if (resolved) { this._internal.once('resolved', event_switcher(this, resolved).func); }
-        if (rejected) { this._internal.once('rejected', event_switcher(this, rejected).func); }
-
+        if (rejected)
+        {
+            this._internal.once('rejected', event_switcher(this, rejected).func);
+        }
+        else
+        {
+            this._internal.once('rejected', function (e) { process.emit('uncaughtException', 'promise.unhandledRejection: ' + e); });
+        }
+                      
         var retVal = new Promise(function (r, j) { });
         this._internal.once('resolved', retVal._internal.resolver);
         this._internal.once('rejected', retVal._internal.rejector);