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();
             }
diff --git a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/trace/TraceHandling.java b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/trace/TraceHandling.java
index a6f7c854b0a0a0bae4c1dfdbd5cc75ad5bac03b3..691b67005dfe1c88f6a0d1ed7bd407b0a50da7da 100644
--- a/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/trace/TraceHandling.java
+++ b/com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/instrument/trace/TraceHandling.java
@@ -136,7 +136,7 @@ public class TraceHandling {
         }
 
         @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()) {
                 indent -= INDENT;
             }
@@ -168,7 +168,7 @@ public class TraceHandling {
 
         }
 
-        public void onReturnExceptional(Probe probe, Node node, VirtualFrame vFrame, Exception exception) {
+        public void onReturnExceptional(Probe probe, Node node, VirtualFrame vFrame, Throwable exception) {
             if (!disabled()) {
                 //
             }
diff --git a/mx.fastr/suite.py b/mx.fastr/suite.py
index 9620502877c17ede6bf424fadea66a8513ae4cc1..b618bf2f4d618a49cd129d5a54c9ec106764939a 100644
--- a/mx.fastr/suite.py
+++ b/mx.fastr/suite.py
@@ -21,13 +21,13 @@
 # questions.
 #
 suite = {
-  "mxversion" : "5.6.0",
+  "mxversion" : "5.6.1",
   "name" : "fastr",
   "imports" : {
     "suites" : [
             {
                "name" : "graal",
-               "version" : "b62242b9ddd79896cc69b8f660d0509f61d5519b",
+               "version" : "d6f0245476e26f823d723d21b996eba0a069771b",
                "urls" : [{"url" : "http://lafo.ssw.uni-linz.ac.at/hg/graal-compiler", "kind" : "hg"}]
             },
         ],