Fix CLDCONNECT-968 - Added bullet proof code to exception message check