diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index bce3c91fc..9f20e89b7 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -1180,8 +1180,10 @@ public class SyncManager extends Service implements Runnable {
     }
 
     static private synchronized void shutdownConnectionManager() {
-        sClientConnectionManager.shutdown();
-        sClientConnectionManager = null;
+        if (sClientConnectionManager != null) {
+            sClientConnectionManager.shutdown();
+            sClientConnectionManager = null;
+        }
     }
 
     public static void stopAccountSyncs(long acctId) {