~ Fixed connection errors handling