2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
index 2cd0eca8..895690c2 100644
--- a/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
+++ b/plugins/base/src/main/kotlin/translators/descriptors/DefaultDescriptorToDocumentableTranslator.kt
@@ -32,7 +32,7 @@ class DefaultDescriptorToDocumentableTranslator(
         moduleName: String,
         packageFragments: Iterable<PackageFragmentDescriptor>,
         platformData: PlatformData
-    ) = DokkaDescriptorVisitor(platformData, context.platforms[platformData]?.facade!!).run {
+    ) = DokkaDescriptorVisitor(platformData, context.platforms.getValue(platformData).facade).run {
         packageFragments.map {
             visitPackageFragmentDescriptor(
                 it,
diff --git a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
index 03a28ceb..4da35099 100644
--- a/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
+++ b/plugins/base/src/main/kotlin/translators/documentables/DefaultPageCreator.kt
@@ -74,7 +74,7 @@ open class DefaultPageCreator(
 
     protected open fun contentForClasslike(c: Classlike) = contentBuilder.contentFor(c) {
         when (c) { // TODO this when will be removed when signature generation is moved to utils
-            is Class -> header(1) { text(c.name) }
+            is Class, is Object, is Annotation, is Interface -> header(1) { text(c.name ?: "<>") }
             is Enum -> {
                 header(1) { text("enum ${c.name}") }
                 block("Entries", 2, ContentKind.Properties, c.entries, c.platformData.toSet()) { entry ->
@@ -124,3 +124,7 @@ open class DefaultPageCreator(
 
     protected open fun TagWrapper.toHeaderString() = this.javaClass.toGenericString().split('.').last()
 }
+
+class A {
+    companion object F {}
+}
+\ No newline at end of file