Managed most of the error possible during connection opening.
Merged with master