diff --git a/src/main/java/org/qortal/controller/Synchronizer.java b/src/main/java/org/qortal/controller/Synchronizer.java
index a4d60e29..21376838 100644
--- a/src/main/java/org/qortal/controller/Synchronizer.java
+++ b/src/main/java/org/qortal/controller/Synchronizer.java
@@ -773,31 +773,31 @@ public class Synchronizer {
 
                     // If we have already received recent or newer blocks from this peer, go ahead and apply them
                     if (peerBlocks.size() > 0) {
+						final BlockData ourLatestBlockData = repository.getBlockRepository().getLastBlock();
                     	final Block peerLatestBlock = peerBlocks.get(peerBlocks.size() - 1);
 						final Long minLatestBlockTimestamp = Controller.getMinimumLatestBlockTimestamp();
+						if (ourLatestBlockData != null && peerLatestBlock != null && minLatestBlockTimestamp != null) {
 
-						// If we have received at least one recent block, we can apply them
-                    	if (peerLatestBlock != null && minLatestBlockTimestamp != null
-								&& peerLatestBlock.getBlockData().getTimestamp() > minLatestBlockTimestamp) {
-							LOGGER.debug("Newly received blocks are recent, so we will apply them");
-							break;
-						}
-
-						// If our latest block is very old....
-						final BlockData ourLatestBlockData = repository.getBlockRepository().getLastBlock();
-						if (minLatestBlockTimestamp != null && ourLatestBlockData.getTimestamp() < minLatestBlockTimestamp) {
-							// ... and we have received a block that is more recent than our latest block ...
-							if (peerLatestBlock.getBlockData().getTimestamp() > ourLatestBlockData.getTimestamp()) {
-								// ... then apply the blocks, as it takes us a step forward.
-								// This is particularly useful when starting up a node that was on a small fork when it was last shut down.
-								// In these cases, we now allow the node to sync forward, and get onto the main chain again.
-								// Without this, we would require that the node syncs ENTIRELY with this peer,
-								// and any problems downloading a block would cause all progress to be lost.
-								LOGGER.debug(String.format("Newly received blocks are %d ms newer than our latest block - so we will apply them", peerLatestBlock.getBlockData().getTimestamp() - ourLatestBlockData.getTimestamp()));
+							// If we have received at least one recent block, we can apply them
+							if (peerLatestBlock.getBlockData().getTimestamp() > minLatestBlockTimestamp) {
+								LOGGER.debug("Newly received blocks are recent, so we will apply them");
 								break;
 							}
-						}
 
+							// If our latest block is very old....
+							if (ourLatestBlockData.getTimestamp() < minLatestBlockTimestamp) {
+								// ... and we have received a block that is more recent than our latest block ...
+								if (peerLatestBlock.getBlockData().getTimestamp() > ourLatestBlockData.getTimestamp()) {
+									// ... then apply the blocks, as it takes us a step forward.
+									// This is particularly useful when starting up a node that was on a small fork when it was last shut down.
+									// In these cases, we now allow the node to sync forward, and get onto the main chain again.
+									// Without this, we would require that the node syncs ENTIRELY with this peer,
+									// and any problems downloading a block would cause all progress to be lost.
+									LOGGER.debug(String.format("Newly received blocks are %d ms newer than our latest block - so we will apply them", peerLatestBlock.getBlockData().getTimestamp() - ourLatestBlockData.getTimestamp()));
+									break;
+								}
+							}
+						}
                     }
                     // Otherwise, give up and move on to the next peer, to avoid putting our chain into an outdated state
                     return SynchronizationResult.NO_REPLY;
@@ -826,29 +826,30 @@ public class Synchronizer {
 
 					// If we have already received recent or newer blocks from this peer, go ahead and apply them
 					if (peerBlocks.size() > 0) {
+						final BlockData ourLatestBlockData = repository.getBlockRepository().getLastBlock();
 						final Block peerLatestBlock = peerBlocks.get(peerBlocks.size() - 1);
 						final Long minLatestBlockTimestamp = Controller.getMinimumLatestBlockTimestamp();
+						if (ourLatestBlockData != null && peerLatestBlock != null && minLatestBlockTimestamp != null) {
 
-						// If we have received at least one recent block, we can apply them
-						if (peerLatestBlock != null && minLatestBlockTimestamp != null
-								&& peerLatestBlock.getBlockData().getTimestamp() > minLatestBlockTimestamp) {
-							LOGGER.debug("Newly received blocks are recent, so we will apply them");
-							break;
-						}
-
-						// If our latest block is very old....
-						final BlockData ourLatestBlockData = repository.getBlockRepository().getLastBlock();
-						if (minLatestBlockTimestamp != null && ourLatestBlockData.getTimestamp() < minLatestBlockTimestamp) {
-							// ... and we have received a block that is more recent than our latest block ...
-							if (peerLatestBlock.getBlockData().getTimestamp() > ourLatestBlockData.getTimestamp()) {
-								// ... then apply the blocks, as it takes us a step forward.
-								// This is particularly useful when starting up a node that was on a small fork when it was last shut down.
-								// In these cases, we now allow the node to sync forward, and get onto the main chain again.
-								// Without this, we would require that the node syncs ENTIRELY with this peer,
-								// and any problems downloading a block would cause all progress to be lost.
-								LOGGER.debug(String.format("Newly received blocks are %d ms newer than our latest block - so we will apply them", peerLatestBlock.getBlockData().getTimestamp() - ourLatestBlockData.getTimestamp()));
+							// If we have received at least one recent block, we can apply them
+							if (peerLatestBlock.getBlockData().getTimestamp() > minLatestBlockTimestamp) {
+								LOGGER.debug("Newly received blocks are recent, so we will apply them");
 								break;
 							}
+
+							// If our latest block is very old....
+							if (ourLatestBlockData.getTimestamp() < minLatestBlockTimestamp) {
+								// ... and we have received a block that is more recent than our latest block ...
+								if (peerLatestBlock.getBlockData().getTimestamp() > ourLatestBlockData.getTimestamp()) {
+									// ... then apply the blocks, as it takes us a step forward.
+									// This is particularly useful when starting up a node that was on a small fork when it was last shut down.
+									// In these cases, we now allow the node to sync forward, and get onto the main chain again.
+									// Without this, we would require that the node syncs ENTIRELY with this peer,
+									// and any problems downloading a block would cause all progress to be lost.
+									LOGGER.debug(String.format("Newly received blocks are %d ms newer than our latest block - so we will apply them", peerLatestBlock.getBlockData().getTimestamp() - ourLatestBlockData.getTimestamp()));
+									break;
+								}
+							}
 						}
 					}
 					// Otherwise, give up and move on to the next peer, to avoid putting our chain into an outdated state