diff --git a/client/galaxy/scripts/mvc/tool/tool-form.js b/client/galaxy/scripts/mvc/tool/tool-form.js
index bad94b7938d..054ad9e8150 100644
--- a/client/galaxy/scripts/mvc/tool/tool-form.js
+++ b/client/galaxy/scripts/mvc/tool/tool-form.js
@@ -323,7 +323,7 @@ var View = Backbone.View.extend({
         var index = {};
         for (let i in job_def.inputs) {
             let input = job_def.inputs[i];
-            if ($.isArray(input.values)) {
+            if (input && $.isArray(input.values)) {
                 for (let j of input.values) {
                     if (j.src && !index[j.id]) {
                         inputs.push(j);