DDF-569: Added check for ClientException in checkAvailability