Cleanup more instances of not checking for null connection