Fix exception propogation in Promises