Reject promises when errors occur
Merge remote-tracking branch 'origin/master'