Simplify usage of promises

The current code swallows errors and is more complicated than needed.