Fix regression due to Illegal Catch Sonar violation fix: no multi-catch in JDK 6