Return promise so we don't forget promise resolution on errors
Merge pull request #2 from jonasfj/bug-990257

Return promise so we don't forget promise resolution on errors