diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java
index 73af63a46bc..ec6506ea2e1 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/TypeDeserializer.java
@@ -99,6 +99,11 @@ public class TypeDeserializer {
             public List<AnnotationDescriptor> getAnnotations() {
                 return Collections.emptyList();
             }
+
+            @Override
+            public String toString() {
+                return TypeUtils.toString(this);
+            }
         };
     }
 
diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
index 3034573389a..248749b7f97 100644
--- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
+++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedClassDescriptor.java
@@ -208,6 +208,11 @@ public class DeserializedClassDescriptor extends ClassDescriptorBase implements
         public List<AnnotationDescriptor> getAnnotations() {
             return Collections.emptyList(); // TODO
         }
+
+        @Override
+        public String toString() {
+            return getName().toString();
+        }
     }
 
     private static class DeserializedClassMemberScope extends DeserializedMemberScope {