Handle connection errors more gracefully
Handle connection errors more gracefully