diff --git a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
index c37ca6f38..66143a556 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/PeerCoordinator.java
@@ -999,13 +999,13 @@ class PeerCoordinator implements PeerListener
           }
         catch (IOException ioe)
           {
-            snark.stopTorrent();
             String msg = "Error writing storage (piece " + piece + ") for " + metainfo.getName() + ": " + ioe;
             _log.error(msg, ioe);
             if (listener != null) {
                 listener.addMessage(msg);
                 listener.addMessage("Fatal storage error: Stopping torrent " + metainfo.getName());
             }
+            snark.stopTorrent();
             throw new RuntimeException(msg, ioe);
           }
         wantedPieces.remove(p);
diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
index b5e10b940..16a4f0af2 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java
@@ -902,7 +902,7 @@ public class SnarkManager implements CompleteListener {
             filename = sfile.getCanonicalPath();
         } catch (IOException ioe) {
             _log.error("Unable to add the torrent " + filename, ioe);
-            addMessage(_("Error: Could not add the torrent {0}", filename) + ": " + ioe.getMessage());
+            addMessage(_("Error: Could not add the torrent {0}", filename) + ": " + ioe);
             return;
         }
         File dataDir = getDataDir();
@@ -1677,7 +1677,7 @@ public class SnarkManager implements CompleteListener {
                     // don't let one bad torrent kill the whole loop
                     addTorrent(name, !shouldAutoStart());
                 } catch (Exception e) {
-                    addMessage(_("Error: Could not add the torrent {0}", name) + ": " + e.getMessage());
+                    addMessage(_("Error: Could not add the torrent {0}", name) + ": " + e);
                     _log.error("Unable to add the torrent " + name, e);
                 }
             }
diff --git a/apps/i2psnark/java/src/org/klomp/snark/Storage.java b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
index 278ba029b..53cc556ed 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/Storage.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/Storage.java
@@ -825,7 +825,7 @@ public class Storage
                 }
                 if (++file >= _torrentFiles.size())
                     break;
-                fileEnd += tf.length;
+                fileEnd += _torrentFiles.get(file).length;
             }
             if (correctHash)
               {