diff --git a/src/com/fsck/k9/Preferences.java b/src/com/fsck/k9/Preferences.java
index 6ee07f538..f0d0beea8 100644
--- a/src/com/fsck/k9/Preferences.java
+++ b/src/com/fsck/k9/Preferences.java
@@ -129,8 +129,13 @@ public class Preferences {
     }
 
     public synchronized void deleteAccount(Account account) {
-        accounts.remove(account.getUuid());
-        accountsInOrder.remove(account);
+    	if (accounts != null) {
+    		accounts.remove(account.getUuid());
+    	}
+    	if (accountsInOrder != null) {
+    		accountsInOrder.remove(account);	
+    	}
+
         account.delete(this);
 
         if (newAccount == account) {