diff --git a/org.lflang/src/org/lflang/federated/FederateInstance.java b/org.lflang/src/org/lflang/federated/FederateInstance.java
index fa1ada37bf..c32095acfb 100644
--- a/org.lflang/src/org/lflang/federated/FederateInstance.java
+++ b/org.lflang/src/org/lflang/federated/FederateInstance.java
@@ -366,7 +366,7 @@ public boolean contains(ReactorInstance instance) {
      * in a top-level reaction that belongs to this federate.
      * This also returns true if the program is not federated.
      * 
-     * @param action The action
+     * @param timer The timer
      * @return True if this federate contains the action in the specified reactor
      */
     public boolean contains(Timer timer) {
@@ -510,7 +510,8 @@ public LinkedHashMap<Output, TimeValue> findOutputsConnectedToPhysicalActions(Re
     
     @Override
     public String toString() {
-        return "Federate " + id + ": " + instantiation.getName();
+        return "Federate " + id + ": "
+            + ((instantiation != null) ? instantiation.getName() : "no name");
     }
 
     /////////////////////////////////////////////