diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp
index 44f8086a6..2754aab45 100644
--- a/src/cpp/ripple/NetworkOPs.cpp
+++ b/src/cpp/ripple/NetworkOPs.cpp
@@ -595,10 +595,14 @@ public:
 
 void NetworkOPs::checkState(const boost::system::error_code& result)
 { // Network state machine
+
 	if ((result == boost::asio::error::operation_aborted) || theConfig.RUN_STANDALONE)
 		return;
+
 	setStateTimer();
 
+	ScopedLock(theApp->getMasterLock());
+
 	std::vector<Peer::pointer> peerList = theApp->getConnectionPool().getPeerVector();
 
 	// do we have sufficient peers? If not, we are disconnected.
@@ -618,12 +622,9 @@ void NetworkOPs::checkState(const boost::system::error_code& result)
 		cLog(lsINFO) << "Node count (" << peerList.size() << ") is sufficient.";
 	}
 
-	if (mConsensus)
-	{
-		mConsensus->timerEntry();
-		return;
-	}
-	tryStartConsensus();
+	if (!mConsensus)
+		tryStartConsensus();
+
 	if (mConsensus)
 		mConsensus->timerEntry();
 }
@@ -632,7 +633,7 @@ void NetworkOPs::tryStartConsensus()
 {
 	uint256 networkClosed;
 	bool ledgerChange = checkLastClosedLedger(theApp->getConnectionPool().getPeerVector(), networkClosed);
-	if(networkClosed.isZero())
+	if (networkClosed.isZero())
 		return;
 
 	// WRITEME: Unless we are in omFULL and in the process of doing a consensus,