diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
index 13fe07ba61b..f707de835b8 100644
--- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
+++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java
@@ -73,7 +73,7 @@ public AgentSpan onConnection(final AgentSpan span, final Connection connection)
           if (url != null) {
             try {
               dbInfo = JDBCConnectionUrlParser.parse(url, connection.getClientInfo());
-            } catch (final Exception ex) {
+            } catch (final Throwable ex) {
               // getClientInfo is likely not allowed.
               dbInfo = JDBCConnectionUrlParser.parse(url, null);
             }
diff --git a/dd-java-agent/instrumentation/jdbc/src/test/groovy/test/TestConnection.groovy b/dd-java-agent/instrumentation/jdbc/src/test/groovy/test/TestConnection.groovy
index a52de68ef3a..110c29042e6 100644
--- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/test/TestConnection.groovy
+++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/test/TestConnection.groovy
@@ -251,7 +251,7 @@ class TestConnection implements Connection {
 
   @Override
   Properties getClientInfo() throws SQLException {
-    throw new UnsupportedOperationException("Test 123")
+    throw new Throwable("Test 123")
   }
 
   @Override