From 7c270c23e6316e4be5f2bc23a4faaf314404a136 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Fri, 6 Apr 2018 20:47:16 +0200
Subject: [PATCH] BlockFileLoader: On an unexpected problem, wrap exception
 with additional information.

---
 core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java b/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java
index df6975cc..ae728e98 100644
--- a/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java
+++ b/core/src/main/java/org/bitcoinj/utils/BlockFileLoader.java
@@ -85,6 +85,7 @@ public class BlockFileLoader implements Iterable<Block>, Iterator<Block> {
     }
 
     private Iterator<File> fileIt;
+    private File file = null;
     private FileInputStream currentFileStream = null;
     private Block nextBlock = null;
     private NetworkParameters params;
@@ -136,8 +137,9 @@ public class BlockFileLoader implements Iterable<Block>, Iterator<Block> {
                     currentFileStream = null;
                     return;
                 }
+                file = fileIt.next();
                 try {
-                    currentFileStream = new FileInputStream(fileIt.next());
+                    currentFileStream = new FileInputStream(file);
                 } catch (FileNotFoundException e) {
                     currentFileStream = null;
                 }
@@ -172,6 +174,8 @@ public class BlockFileLoader implements Iterable<Block>, Iterator<Block> {
                 } catch (ProtocolException e) {
                     nextBlock = null;
                     continue;
+                } catch (Exception e) {
+                    throw new RuntimeException("unexpected problem with block in " + file, e);
                 }
                 break;
             } catch (IOException e) {