Catch connection exception
SONARPLUGINS-3250 Fix some minor issues