Minor cleanup to account cleanup and connection error handling

20 months ago, Elliott Sales de Andrade