Add some checks for not ready connections