diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/OrmClientDecoratorTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/OrmClientDecoratorTest.groovy
index 81367bdfb2..8f1a724a22 100644
--- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/OrmClientDecoratorTest.groovy
+++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/OrmClientDecoratorTest.groovy
@@ -27,6 +27,17 @@ class OrmClientDecoratorTest extends DatabaseClientDecoratorTest {
     "name set"        | "not null" | "name"     || true
   }
 
+  def "test onOperation null span"() {
+    setup:
+    decorator = newDecorator({ e -> null })
+
+    when:
+    decorator.onOperation(null, null)
+
+    then:
+    thrown(AssertionError)
+  }
+
 
   def newDecorator(name) {
     return new OrmClientDecorator() {