Merge pull request #3356

d3ef9b0 Prevent empty transactions from being added to vtxPrev (Wladimir J. van der Laan)

src/wallet.cpp

@@ -765,6 +765,10 @@ void CWalletTx::AddSupportingTransactions()
                 {
                     tx = *mapWalletPrev[hash];
                 }
+                else
+                {
+                    continue;
+                }
 
                 int nDepth = tx.SetMerkleBranch();
                 vtxPrev.push_back(tx);