diff --git a/src/com/android/email/Controller.java b/src/com/android/email/Controller.java
index 2d13e4200..a7b77c5b6 100644
--- a/src/com/android/email/Controller.java
+++ b/src/com/android/email/Controller.java
@@ -868,8 +868,11 @@ public class Controller {
      */
     public void loadAttachment(final long attachmentId, final long messageId,
             final long accountId) {
-
         Attachment attachInfo = Attachment.restoreAttachmentWithId(mProviderContext, attachmentId);
+        if (attachInfo == null) {
+            return;
+        }
+
         if (Utility.attachmentExists(mProviderContext, attachInfo)) {
             // The attachment has already been downloaded, so we will just "pretend" to download it
             // This presumably is for POP3 messages