Connection error wraping added