diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/REntryCounters.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/REntryCounters.java
index adad10544c21562087edb966a88ed6a4b6a39109..a1141a1dce7cb963c2b2d970abd5e00886684393 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/REntryCounters.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/REntryCounters.java
@@ -67,7 +67,7 @@ public class REntryCounters {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Exception exception) {
+        public void onReturnExceptional(Probe probe, Throwable exception) {
             returnAny(probe);
         }
 
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/RNodeTimer.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/RNodeTimer.java
index cbe19763454f79d714d813af6fab24b9babc44ef..9e1ca0401f0d3fe3df0ad853f1224e4e5a63a6cb 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/RNodeTimer.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/RNodeTimer.java
@@ -75,7 +75,7 @@ public class RNodeTimer {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Exception exception) {
+        public void onReturnExceptional(Probe probe, Throwable exception) {
             returnAny(probe);
         }
 
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/debug/DebugHandling.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/debug/DebugHandling.java
index dd5f93744e8ddfdd3007f05d5ec435870eef2c9e..27a2c77fe22854e34321fcbdadc8b06e92e8525a 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/debug/DebugHandling.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/debug/DebugHandling.java
@@ -206,7 +206,7 @@ public class DebugHandling {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Exception exception) {
+        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Throwable exception) {
         }
 
         boolean disabled() {
@@ -371,7 +371,7 @@ public class DebugHandling {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Exception exception) {
+        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Throwable exception) {
             if (!disabled()) {
                 returnCleanup(frame);
             }
@@ -467,7 +467,7 @@ public class DebugHandling {
         }
 
         @Override
-        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Exception exception) {
+        public void onReturnExceptional(Probe probe, Node node, VirtualFrame frame, Throwable exception) {
             if (!disabled()) {
                 returnCleanup();
             }