From f94d9803c63d759e63aab06f675fffba8c2b2614 Mon Sep 17 00:00:00 2001
From: Evan Duffield <evan@dashpay.io>
Date: Thu, 6 Aug 2015 16:09:22 -0700
Subject: [PATCH] Fixed --disablewallet crash

---
 src/init.cpp              | 2 +-
 src/masternode-budget.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index cc8262617..d42cec89d 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1499,7 +1499,7 @@ bool AppInit2(boost::thread_group& threadGroup)
     //get the mode of budget voting for this masternode
     strBudgetMode = GetArg("-budgetvotemode", "auto");
 
-    if(GetBoolArg("-mnconflock", true)) {
+    if(GetBoolArg("-mnconflock", true) && pwalletMain) {
         LOCK(pwalletMain->cs_wallet);
         LogPrintf("Locking Masternodes:\n");
         uint256 mnTxHash;
diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
index 974f1aa92..86d0171a5 100644
--- a/src/masternode-budget.cpp
+++ b/src/masternode-budget.cpp
@@ -149,6 +149,7 @@ void CBudgetManager::SubmitFinalBudget()
 
     //create fee tx
     CTransaction tx;
+    
     if(!mapCollateral.count(tempBudget.GetHash())){
         CWalletTx wtx;
         if(!pwalletMain->GetBudgetSystemCollateralTX(wtx, tempBudget.GetHash(), false)){