Removing trhow error on missing connection. Adding cb validations.