Updates error handling and logging
Merge remote-tracking branch 'origin/master'