Revert "simplify robust error handling - I'm loving error handling from promises APIs"

This reverts commit 39db759d023a61ef6f0ef1d3c35dad6f593de237.
simplify error handling