diff --git a/src/com/android/exchange/SyncManager.java b/src/com/android/exchange/SyncManager.java
index f9554891b..5eb7b2d82 100644
--- a/src/com/android/exchange/SyncManager.java
+++ b/src/com/android/exchange/SyncManager.java
@@ -1651,8 +1651,9 @@ public class SyncManager extends Service implements Runnable {
         for (long mailboxId: mServiceMap.keySet()) {
             Mailbox m = Mailbox.restoreMailboxWithId(this, mailboxId);
             if (m != null) {
-                if (m.mAccountKey == accountId &&
-                        m.mServerId.startsWith(Eas.ACCOUNT_MAILBOX_PREFIX)) {
+                String serverId = m.mServerId;
+                if (m.mAccountKey == accountId && serverId != null &&
+                        serverId.startsWith(Eas.ACCOUNT_MAILBOX_PREFIX)) {
                     // Here's our account mailbox; reset him (stopping pings)
                     AbstractSyncService svc = mServiceMap.get(mailboxId);
                     svc.reset();