Now handling broken connections gracefully.