diff --git a/src/main/java/com/redstoner/modules/mail/Mail.java b/src/main/java/com/redstoner/modules/mail/Mail.java
index ee26842..5cae0b7 100644
--- a/src/main/java/com/redstoner/modules/mail/Mail.java
+++ b/src/main/java/com/redstoner/modules/mail/Mail.java
@@ -400,7 +400,7 @@ public class Mail implements Module, Listener
 		String uuid = ((Player)sender).getUniqueId().toString();
 		Map<Integer,Msg> list = archives.get(uuid);
 		
-		if (id < 0 || id >= list.size()) {
+		if (id < 0 || list == null || !list.containsKey(id)) {
 			getLogger().message(sender, true, "You have no archived messages with that ID.");
 			return;
 		}