diff --git a/cwltool/draft2tool.py b/cwltool/draft2tool.py
index e3f2c4776..4e4442c50 100644
--- a/cwltool/draft2tool.py
+++ b/cwltool/draft2tool.py
@@ -391,9 +391,9 @@ def rm_pending_output_callback(output_callbacks, jobcachepending,
                             "writable": t.get("writable")
                         }
                     else:
-                        if t["entryname"] or t["writable"]:
+                        if t.get("entryname") or t.get("writable"):
                             t = copy.deepcopy(t)
-                            if t["entryname"]:
+                            if t.get("entryname"):
                                 t["entry"]["basename"] = t["entryname"]
                             t["entry"]["writable"] = t.get("writable")
                         ls[i] = t["entry"]