[scaladoc] Scaladoc no longer crashes upon real...

[scaladoc] Scaladoc no longer crashes upon realising there is nothing to
document. Closes #3928. No review.

1 files changed, 12 insertions, 11 deletions

diff --git a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
index a034006a5c..7b8115b4c1 100644
--- a/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
+++ b/src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
@@ -26,16 +26,17 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { thisFactory
   private var universe: Universe = null
 
   /**  */
-  def makeModel: Universe = {
-    val universe = new Universe { thisUniverse =>
-      thisFactory.universe = thisUniverse
-      val settings = thisFactory.settings
-      val rootPackage =
-        makeRootPackage getOrElse { throw new Error("no documentable class found in compilation units") }
+  def makeModel: Option[Universe] = {
+    makeRootPackage map { rootPack =>
+      val universe = new Universe { thisUniverse =>
+        thisFactory.universe = thisUniverse
+        val settings = thisFactory.settings
+        val rootPackage = rootPack
+      }
+      modelFinished = true
+      thisFactory.universe = null
+      universe
     }
-    modelFinished = true
-    thisFactory.universe = null
-    universe
   }
 
   /** */
@@ -419,8 +420,8 @@ class ModelFactory(val global: Global, val settings: doc.Settings) { thisFactory
           else None
         else
           Some(new NonTemplateMemberImpl(bSym, inTpl) with Val {
-                override def isLazyVal = true
-              })
+            override def isLazyVal = true
+          })
       else if (bSym.isGetter && bSym.accessed.isMutable)
         Some(new NonTemplateMemberImpl(bSym, inTpl) with Val {
           override def isVar = true