More connection cleaning up for error handling.