Minor cleanup to account cleanup and connection error handling

Testing Done:
Compile only.

Reviewed at https://reviews.imfreedom.org/r/1812/