diff --git a/src/main.cpp b/src/main.cpp
index 1098c6f8c..8469e98cf 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1595,9 +1595,11 @@ static bool ApplyTxInUndo(const CTxInUndo& undo, CCoinsViewCache& view, CNCCTrie
         std::string name(vvchParams[0].begin(), vvchParams[0].end());
         LogPrintf("%s: Restoring %s to the NCC trie due to a block being disconnected\n", __func__, name.c_str());
         int nValidHeight = undo.nNCCValidHeight;
-        assert(nValidHeight > 0 && nValidHeight >= coins->nHeight);
-        if (!trieCache.undoSpendClaim(name, out.hash, out.n, undo.txout.nValue, coins->nHeight, nValidHeight))
-            LogPrintf("%s: Something went wrong inserting the name\n", __func__);
+        if (nValidHeight > 0 && nValidHeight >= coins->nHeight)
+        {
+            if (!trieCache.undoSpendClaim(name, out.hash, out.n, undo.txout.nValue, coins->nHeight, nValidHeight))
+                LogPrintf("%s: Something went wrong inserting the name\n", __func__);
+        }
     }
 
     coins->vout[out.n] = undo.txout;
@@ -1874,12 +1876,13 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                     std::string name(vvchParams[0].begin(), vvchParams[0].end());
                     int nValidAtHeight;
                     LogPrintf("%s: Removing %s from the ncc trie. Tx: %s, nOut: %d\n", __func__, name, txin.prevout.hash.GetHex(), txin.prevout.n);
-                    if (!trieCache.spendClaim(name, txin.prevout.hash, txin.prevout.n, coins->nHeight, nValidAtHeight))
-                        LogPrintf("%s: Something went wrong removing the name\n", __func__);
-                    mNCCUndoHeights[i] = nValidAtHeight;
-                    std::pair<uint256, unsigned int> val(txin.prevout.hash, txin.prevout.n);
-                    std::pair<std::string, std::pair<uint256, unsigned int> > entry(name, val);
-                    spentClaims.insert(entry);
+                    if (trieCache.spendClaim(name, txin.prevout.hash, txin.prevout.n, coins->nHeight, nValidAtHeight))
+                    {
+                        mNCCUndoHeights[i] = nValidAtHeight;
+                        std::pair<uint256, unsigned int> val(txin.prevout.hash, txin.prevout.n);
+                        std::pair<std::string, std::pair<uint256, unsigned int> > entry(name, val);
+                        spentClaims.insert(entry);
+                    }
                 }
             }
             
diff --git a/src/test/ncctrie_tests.cpp b/src/test/ncctrie_tests.cpp
index 4fac1c6cc..8b0570885 100644
--- a/src/test/ncctrie_tests.cpp
+++ b/src/test/ncctrie_tests.cpp
@@ -139,7 +139,7 @@ const unsigned int expire_nonces[] = {
    19076, 179631, 36500, 152550, 56501, 81202, 77561, 134713, 81130, 22321,
    112081, 32992, 144573, 21369, 2471, 18371, 63050, 44211, 6147, 206052,
    34252, 534, 20176, 58035, 24268, 19608, 37770, 57588, 120961, 58415,
-   4780, 4614, 229320, 42279, 41295, 23501, 78183}; 
+   4780, 4614, 229320, 42279, 41295, 23501, 78183, 171983, 24229}; 
 
 BOOST_FIXTURE_TEST_SUITE(ncctrie_tests, TestingSetup)
 
@@ -199,9 +199,7 @@ bool CreateBlock(CBlockTemplate* pblocktemplate, int nonce)
     pblock->vtx[0] = CTransaction(txCoinbase);
     pblock->hashMerkleRoot = pblock->BuildMerkleTree();
     //if (nonce != -1)
-    //{
     pblock->nNonce = nonce;
-    //}
     /*else
     {
         for (int i = 0; ; ++i)
@@ -1070,6 +1068,8 @@ BOOST_AUTO_TEST_CASE(ncctrie_claim_expiration)
     BOOST_CHECK(!pnccTrie->empty());
     BOOST_CHECK(pnccTrie->queueEmpty());
     BOOST_CHECK(!pnccTrie->expirationQueueEmpty());
+   
+    mempool.clear();
     
     // advance until the expiration event occurs. verify the event occurs on time.
     
@@ -1094,6 +1094,31 @@ BOOST_AUTO_TEST_CASE(ncctrie_claim_expiration)
     BOOST_CHECK(pnccTrie->empty());
     BOOST_CHECK(pnccTrie->queueEmpty());
     BOOST_CHECK(pnccTrie->expirationQueueEmpty());
+
+    // spend the expired claim
+
+    AddToMempool(tx2);
+
+    BOOST_CHECK(pblocktemplate = CreateNewBlock(scriptPubKey));
+    BOOST_CHECK(pblocktemplate->block.vtx.size() == 2);
+    pblocktemplate->block.hashPrevBlock = chainActive.Tip()->GetBlockHash();
+    BOOST_CHECK(CreateBlock(pblocktemplate, expire_nonces[block_counter++]));
+    blocks_to_invalidate.push_back(pblocktemplate->block.hashPrevBlock);
+    delete pblocktemplate;
+
+    BOOST_CHECK(pnccTrie->empty());
+    BOOST_CHECK(pnccTrie->queueEmpty());
+    BOOST_CHECK(pnccTrie->expirationQueueEmpty());
+
+    // undo the spend. verify everything remains empty.
+
+    BOOST_CHECK(RemoveBlock(blocks_to_invalidate.back()));
+    blocks_to_invalidate.pop_back();
+    BOOST_CHECK(pnccTrie->empty());
+    BOOST_CHECK(pnccTrie->queueEmpty());
+    BOOST_CHECK(pnccTrie->expirationQueueEmpty());
+
+    mempool.clear();
     
     // roll back to before the expiration event. verify the claim is reinserted. verify the expiration event is scheduled again.
 
@@ -1103,6 +1128,26 @@ BOOST_AUTO_TEST_CASE(ncctrie_claim_expiration)
     BOOST_CHECK(pnccTrie->queueEmpty());
     BOOST_CHECK(!pnccTrie->expirationQueueEmpty());
 
+    // verify the expiration event happens at the right time again
+
+    BOOST_CHECK(pblocktemplate = CreateNewBlock(scriptPubKey));
+    pblocktemplate->block.hashPrevBlock = chainActive.Tip()->GetBlockHash();
+    BOOST_CHECK(CreateBlock(pblocktemplate, expire_nonces[block_counter++]));
+    blocks_to_invalidate.push_back(pblocktemplate->block.hashPrevBlock);
+    delete pblocktemplate;
+
+    BOOST_CHECK(pnccTrie->empty());
+    BOOST_CHECK(pnccTrie->queueEmpty());
+    BOOST_CHECK(pnccTrie->expirationQueueEmpty());
+
+    // roll back to before the expiration event. verify it gets reinserted and expiration gets scheduled.
+
+    BOOST_CHECK(RemoveBlock(blocks_to_invalidate.back()));
+    blocks_to_invalidate.pop_back();
+    BOOST_CHECK(!pnccTrie->empty());
+    BOOST_CHECK(pnccTrie->queueEmpty());
+    BOOST_CHECK(!pnccTrie->expirationQueueEmpty());
+
     // roll back to before the claim is valid. verify the claim is removed but the expiration event is not.
     
     BOOST_CHECK(RemoveBlock(blocks_to_invalidate.back()));