catch namespace load throwables

broadinstitute · Mar 27, 2017 · 71bc6fc · 71bc6fc
1 parent ddf58e7
commit 71bc6fc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...rc/main/scala/cromwell/engine/workflow/lifecycle/MaterializeWorkflowDescriptorActor.scala b/...rc/main/scala/cromwell/engine/workflow/lifecycle/MaterializeWorkflowDescriptorActor.scala
@@ -390,8 +390,10 @@ class MaterializeWorkflowDescriptorActor(serviceRegistryActor: ActorRef,
           } else {
             List.empty
           }
-          // This .get is ok because we're already in a try/catch.
-          validateWorkflowNameLengths(WdlNamespaceWithWorkflow.load(w.wdlSource, importResolvers).get)
+          WdlNamespaceWithWorkflow.load(w.wdlSource, importResolvers) match {
+            case Failure(e) => s"Unable to load namespace from workflow: ${e.getMessage}".invalidNel
+            case Success(namespace) => validateWorkflowNameLengths(namespace)
+          }
       }
     } catch {
       case e: Exception => s"Unable to load namespace from workflow: ${e.getMessage}".invalidNel