diff --git a/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java b/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java
index 925074237..8e3bcffb8 100644
--- a/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java
+++ b/emailcommon/src/com/android/emailcommon/service/ServiceProxy.java
@@ -76,7 +76,11 @@ public abstract class ServiceProxy {
             // Run our task on a new thread
             new Thread(new Runnable() {
                 public void run() {
-                    runTask();
+                    try {
+                        runTask();
+                    } finally {
+                        endTask();
+                    }
                 }}).start();
         }
 
@@ -134,7 +138,6 @@ public abstract class ServiceProxy {
             thread.join();
         } catch (InterruptedException e) {
         }
-        endTask();
     }
 
     public boolean setTask(ProxyTask task, String name) {