diff --git a/idea/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/idea/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
index 9d27a9f3a50..74a5f264c74 100644
--- a/idea/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
+++ b/idea/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java
@@ -40,16 +40,13 @@ public class TypeHierarchyResolver {
             declaration.accept(new JetVisitorVoid() {
                 @Override
                 public void visitNamespace(JetNamespace namespace) {
+                    String name = JetPsiUtil.safeName(namespace.getName());
 
-                    String name = namespace.getName();
-                    if (name == null) {
-                        name = "<no name provided>";
-                    }
                     NamespaceDescriptorImpl namespaceDescriptor = owner.getNamespace(name);
                     if (namespaceDescriptor == null) {
                         namespaceDescriptor = new NamespaceDescriptorImpl(
                                 owner.getOriginal(),
-                                Collections.<AnnotationDescriptor>emptyList(), // TODO
+                                Collections.<AnnotationDescriptor>emptyList(), // TODO: annotations
                                 name
                         );
                         namespaceDescriptor.initialize(new WritableScopeImpl(JetScope.EMPTY, namespaceDescriptor, context.getTrace().getErrorHandler()).setDebugName("Namespace member scope"));