--- a/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/LineBreakpointFactory.java	Thu Jul 23 16:28:48 2015 +0200
+++ b/truffle/com.oracle.truffle.api/src/com/oracle/truffle/api/debug/LineBreakpointFactory.java	Thu Jul 23 17:23:05 2015 +0200
@@ -69,6 +69,7 @@
 
     private static final String BREAKPOINT_NAME = "LINE BREAKPOINT";
 
+    @TruffleBoundary
     private static void trace(String format, Object... args) {
         if (TRACE) {
             OUT.println(String.format("%s: %s", BREAKPOINT_NAME, String.format(format, args)));
@@ -344,6 +345,7 @@
             return conditionExpr;
         }
 
+        @TruffleBoundary
         @Override
         public void dispose() {
             if (getState() != DISPOSED) {
@@ -377,6 +379,7 @@
             }
         }
 
+        @TruffleBoundary
         private String getShortDescription() {
             return BREAKPOINT_NAME + "@" + getLineLocation().getShortDescription();
         }
@@ -433,16 +436,20 @@
             }
         }
 
-        @TruffleBoundary
         public void notifyFailure(Node node, VirtualFrame vFrame, RuntimeException ex) {
-            warningLog.addWarning(String.format("Exception in %s:  %s", getShortDescription(), ex.getMessage()));
+            addExceptionWarning(ex);
             if (TRACE) {
-                trace("breakpoint failure = %s  %s", ex.toString(), getShortDescription());
+                trace("breakpoint failure = %s  %s", ex, getShortDescription());
             }
             // Take the breakpoint if evaluation fails.
             nodeEnter(node, vFrame);
         }
 
+        @TruffleBoundary
+        private void addExceptionWarning(RuntimeException ex) {
+            warningLog.addWarning(String.format("Exception in %s:  %s", getShortDescription(), ex.getMessage()));
+        }
+
         @Override
         public String getLocationDescription() {
             return "Line: " + lineLocation.getShortDescription();