Catch errors and log instead of letting the errors bubble up - BW
Merge remote-tracking branch 'origin/master'