diff --git a/src/cc/faucet.cpp b/src/cc/faucet.cpp
index 9d20de4d9..f8cc140e9 100644
--- a/src/cc/faucet.cpp
+++ b/src/cc/faucet.cpp
@@ -67,14 +67,13 @@ bool FaucetExactAmounts(Eval* eval,const CTransaction &tx,int32_t minage,uint64_
         if ( IsFaucetInput(tx.vin[i].scriptSig) != 0 )
         {
             fprintf(stderr,"vini.%d check mempool\n",i);
-            if ( mempool.lookup(tx.vin[i].prevout.hash,vinTx) != 0 )
-            //if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
+            if ( eval->GetTxUnconfirmed(tx.vin[i].prevout.hash,vinTx,hashBlock) == 0 )
                 return eval->Invalid("cant faucet mempool tx");
             else
             {
                 fprintf(stderr,"vini.%d check hash and vout\n",i);
-                //if ( hashBlock == zerohash )
-                //    return eval->Invalid("cant faucet from mempool");
+                if ( hashBlock == zerohash )
+                    return eval->Invalid("cant faucet from mempool");
                 if ( (assetoshis= IsFaucetvout(vinTx,tx.vin[i].prevout.n)) != 0 )
                     inputs += assetoshis;
             }
diff --git a/src/main.cpp b/src/main.cpp
index 96f384b27..871da14d7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1614,6 +1614,7 @@ bool myGetTransaction(const uint256 &hash, CTransaction &txOut, uint256 &hashBlo
             return true;
         }
     }
+    return(false);
     fprintf(stderr,"check disk\n");
 
     if (fTxIndex) {