From 3825b6fe4fd6f81db33b4f2e1c99a513dc2431d4 Mon Sep 17 00:00:00 2001
From: Timo Paulssen <timonator@perpetuum-immobile.de>
Date: Fri, 18 Jan 2013 22:06:39 +0100
Subject: [PATCH] fix the rethrow and message. thanks jnthn++

---
 src/core/Exception.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
index 42f8c6321dc..851dc9436a4 100644
--- a/src/core/Exception.pm
+++ b/src/core/Exception.pm
@@ -213,7 +213,7 @@ do {
             $_() for pir::perl6ize_type__PP(@*END_PHASERS);
         }
         if $! {
-            pir::perl6_based_rethrow__0PP(nqp::getattr($!, Exception, '$!ex'), $ex);
+            pir::perl6_based_rethrow__0PP(nqp::getattr(nqp::p6decont($!), Exception, '$!ex'), $ex);
         }
     }
 
@@ -1043,7 +1043,7 @@ my class X::Inheritance::UnknownParent is Exception {
     method message {
         my $message := $.child ~ ' cannot inherit from ' ~ $.parent ~ ' because it is unknown.';
         if +@.suggestions > 1 {
-            $message := $message ~ "\nDid you mean one of these?\n  " ~ nqp::join("\n  ", @.suggestions);
+            $message := $message ~ "\nDid you mean one of these?\n  " ~ @.suggestions.join("\n    ");
         } elsif +@.suggestions == 1 {
             $message := $message ~ "\nDid you mean " ~ @.suggestions[0];
         }