diff --git a/libtransmission/natpmp.c b/libtransmission/natpmp.c
index cfb0963fb..08b2a777c 100644
--- a/libtransmission/natpmp.c
+++ b/libtransmission/natpmp.c
@@ -85,7 +85,9 @@ void
 tr_natpmpClose( tr_natpmp * nat )
 {
     assert( !nat->isMapped );
-    assert( ( nat->state == TR_NATPMP_IDLE ) || ( nat->state == TR_NATPMP_ERR ) );
+    assert( ( nat->state == TR_NATPMP_IDLE )
+         || ( nat->state == TR_NATPMP_ERR )
+         || ( nat->state == TR_NATPMP_DISCOVER ) );
 
     closenatpmp( &nat->natpmp );
     tr_free( nat );
diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c
index 6c2fb3ee8..e1438fc4c 100644
--- a/libtransmission/upnp.c
+++ b/libtransmission/upnp.c
@@ -65,7 +65,9 @@ void
 tr_upnpClose( tr_upnp * handle )
 {
     assert( !handle->isMapped );
-    assert( ( handle->state == TR_UPNP_IDLE ) || ( handle->state == TR_UPNP_ERR ) );
+    assert( ( handle->state == TR_UPNP_IDLE )
+         || ( handle->state == TR_UPNP_ERR )
+         || ( handle->state == TR_UPNP_DISCOVER ) );
 
     if( handle->hasDiscovered )
         FreeUPNPUrls( &handle->urls );