Rethrow exception instead of silently logging it
Merge remote-tracking branch 'origin/master'