Switch to use promises where possible

So we should resolve but still log the error?