diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index d8a8ac8e4..570ddf218 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -58,6 +58,7 @@ Bugs fixed
 - Bug 2037 - HT capabilities may print bogus chars
 - Bug 2038 - Stop method does not stop next wave in WaveformGenerator
 - Bug 2045 - Missing NS_OBJECT_ENSURE_REGISTERED in TcpTxBuffer and TcpRxBuffer
+- Bug 2047 - Ipv6EndPointDemux::Lookup may crash
 
 Known issues
 ------------
diff --git a/src/internet/model/ipv6-end-point-demux.cc b/src/internet/model/ipv6-end-point-demux.cc
index 9bd886759..fc75eaf52 100644
--- a/src/internet/model/ipv6-end-point-demux.cc
+++ b/src/internet/model/ipv6-end-point-demux.cc
@@ -197,6 +197,10 @@ Ipv6EndPointDemux::EndPoints Ipv6EndPointDemux::Lookup (Ipv6Address daddr, uint1
 
       if (endP->GetBoundNetDevice ())
         {
+          if (!incomingInterface)
+            {
+              continue;
+            }
           if (endP->GetBoundNetDevice () != incomingInterface->GetDevice ())
             {
               NS_LOG_LOGIC ("Skipping endpoint " << &endP