--- a/RELEASE_NOTES	Tue Jun 17 10:59:19 2014 -0700
+++ b/RELEASE_NOTES	Tue Jun 17 22:40:32 2014 +0200
@@ -24,6 +24,7 @@
 
 Bugs fixed
 ----------
+- Bug 1930 - Use of invalid reference in OLSR RemoveLinkTuple
 
 Known issues
 ------------

--- a/src/olsr/model/olsr-routing-protocol.cc	Tue Jun 17 10:59:19 2014 -0700
+++ b/src/olsr/model/olsr-routing-protocol.cc	Tue Jun 17 22:40:32 2014 +0200
@@ -2425,8 +2425,8 @@
                 << "s: OLSR Node " << m_mainAddress
                 << " LinkTuple " << tuple << " REMOVED.");
 
+  m_state.EraseNeighborTuple (GetMainAddress (tuple.neighborIfaceAddr));
   m_state.EraseLinkTuple (tuple);
-  m_state.EraseNeighborTuple (GetMainAddress (tuple.neighborIfaceAddr));
 
 }