Index: common/MessageProcessor.cpp
===================================================================
--- common/MessageProcessor.cpp	(revision 198cf2d5aadb5e6ed8898c41b1243d444f18bdac)
+++ common/MessageProcessor.cpp	(revision af713bcae8bf16b2c5689b1f7c491d7b8f642f50)
@@ -57,9 +57,11 @@
 
 void MessageProcessor::cleanAckedMessages() {
-   map<int, MessageContainer>::iterator it;
+   map<int, MessageContainer>::iterator it = sentMessages.begin();
 
-   for(it = sentMessages.begin(); it != sentMessages.end(); it++) {
+   while (it != sentMessages.end()) {
       if (it->second.isAcked && (getCurrentMillis() - it->second.timeAcked) > 1000)
-         sentMessages.erase(it);
+         it = sentMessages.erase(it);
+      else
+         it++;
    }
 }