Adding support to return non-promise values and have the promise chain be broken