diff --git a/src/albumcoverloader.cpp b/src/albumcoverloader.cpp
index b757901fe..1705db349 100644
--- a/src/albumcoverloader.cpp
+++ b/src/albumcoverloader.cpp
@@ -58,9 +58,7 @@ quint64 AlbumCoverLoader::LoadImageAsync(const QString& art_automatic,
 }
 
 void AlbumCoverLoader::ProcessTasks() {
-  forever {
-    if (stop_requested_) return;
-
+  while (!stop_requested_) {
     // Get the next task
     Task task;
     {
diff --git a/src/backgroundthread.h b/src/backgroundthread.h
index de14f4a56..b91d4bea7 100644
--- a/src/backgroundthread.h
+++ b/src/backgroundthread.h
@@ -137,8 +137,8 @@ BackgroundThread<InterfaceType>::BackgroundThread(QObject *parent)
 template <typename InterfaceType>
 BackgroundThread<InterfaceType>::~BackgroundThread() {
   if (isRunning()) {
-    if (worker_) // Possible race condition here
-      worker_->Stop();
+    if (boost::shared_ptr<InterfaceType> w = worker_)
+      w->Stop();
 
     quit();
     if (wait(10000))