Fixes #2 - Add a connectivity check