Minor cleanup to account cleanup and connection error handling

19 months ago, Elliott Sales de Andrade