diff --git a/esp/files/scripts/ESPWorkunit.js b/esp/files/scripts/ESPWorkunit.js
index 7ab745a45d6..cf412b8dc7a 100644
--- a/esp/files/scripts/ESPWorkunit.js
+++ b/esp/files/scripts/ESPWorkunit.js
@@ -186,11 +186,10 @@ define([
             return this.hasCompleted;
         },
         monitor: function (callback) {
-            if (this.hasCompleted) {
-                if (callback) {
-                    callback(this);
-                }
-            } else {
+            if (callback) {
+                callback(this);
+            }
+            if (!this.hasCompleted) {
                 var context = this;
                 this.watch("changedCount", function (name, oldValue, newValue) {
                     if (oldValue !== newValue && newValue) {
diff --git a/esp/files/scripts/ResultsWidget.js b/esp/files/scripts/ResultsWidget.js
index 1e39b997864..08ef74ff0a8 100644
--- a/esp/files/scripts/ResultsWidget.js
+++ b/esp/files/scripts/ResultsWidget.js
@@ -131,7 +131,7 @@ define([
                             }
                         });
                         var currSel = context.getSelectedChild();
-                        if (currSel) {
+                        if (currSel && currSel.refresh) {
                             currSel.refresh();
                         }
                     }