diff --git a/www/js/callbacks.js b/www/js/callbacks.js
index 7b297c03..5c862d50 100644
--- a/www/js/callbacks.js
+++ b/www/js/callbacks.js
@@ -711,7 +711,7 @@ Callbacks = {
 
     queueFail: function (data) {
         if (data.id) {
-            stopQueueSpinner(id);
+            stopQueueSpinner(data);
         }
         queueMessage(data, "alert-danger");
     },
diff --git a/www/js/util.js b/www/js/util.js
index e9653971..7ac24530 100644
--- a/www/js/util.js
+++ b/www/js/util.js
@@ -3094,7 +3094,8 @@ function startQueueSpinner(data) {
 }
 
 function stopQueueSpinner(data) {
-    var shouldRemove = (typeof data === 'object' &&
+    var shouldRemove = (data !== null &&
+                        typeof data === 'object' &&
                         $("#queueprogress").data("queue-id") === data.id);
     shouldRemove = shouldRemove || data === null;
     shouldRemove = shouldRemove || $("#queueprogress").data("queue-id") === "$any";