Updated formatting
Replaced e.printStackTrace() with log statements
Added error handler with retry
adjusted error message
Merge remote-tracking branch 'apache/master'