diff --git a/src/com/android/email/service/EmailServiceStub.java b/src/com/android/email/service/EmailServiceStub.java
index 631653c4f..79eeeb33a 100644
--- a/src/com/android/email/service/EmailServiceStub.java
+++ b/src/com/android/email/service/EmailServiceStub.java
@@ -525,7 +525,9 @@ public abstract class EmailServiceStub extends IEmailService.Stub implements IEm
             // 3.  loop through the available messages and send them
             while (c.moveToNext()) {
                 long messageId = -1;
-                moveToSentValues.remove(EmailContent.MessageColumns.FLAGS);
+                if (moveToSentValues != null) {
+                    moveToSentValues.remove(EmailContent.MessageColumns.FLAGS);
+                }
                 try {
                     messageId = c.getLong(0);
                     // Don't send messages with unloaded attachments