Wrapped exception added, logic which exclude data connection added