Add connection check
Cosmetic