1 files changed, 8 insertions, 2 deletions
diff --git a/src/library/scala/MatchError.scala b/src/library/scala/MatchError.scala
index 6ba7e833d3..9965bb19b5 100644
--- a/src/library/scala/MatchError.scala
+++ b/src/library/scala/MatchError.scala
@@ -23,9 +23,15 @@ final class MatchError(obj: Any) extends RuntimeException {
   /** There's no reason we need to call toString eagerly,
    *  so defer it until getMessage is called.
    */
-  private lazy val objString =
+  private lazy val objString = {
+    def ofClass = "of class " + obj.getClass.getName
     if (obj == null) "null"
-    else obj.toString() + " (of class " + obj.getClass.getName + ")"
+    else try {
+      obj.toString() + " (" + ofClass + ")"
+    } catch {
+      case _: Throwable => "an instance " + ofClass
+    }
+  }
 
   override def getMessage() = objString
 }