diff --git a/src/dorkbox/util/storage/StorageBase.java b/src/dorkbox/util/storage/StorageBase.java
index 4b0a62e..5cb63b5 100644
--- a/src/dorkbox/util/storage/StorageBase.java
+++ b/src/dorkbox/util/storage/StorageBase.java
@@ -323,7 +323,11 @@ class StorageBase {
 
             return readRecordData;
         } catch (Exception e) {
-            String message = e.getMessage().substring(0,e.getMessage().indexOf(OS.LINE_SEPARATOR));
+            String message = e.getMessage();
+            int index = message.indexOf(OS.LINE_SEPARATOR);
+            if (index > -1) {
+                message = message.substring(0, index);
+            }
             if (logger != null) {
                 logger.error("Error reading data from disk: {}", message);
             }
diff --git a/src/dorkbox/util/storage/StorageSystem.java b/src/dorkbox/util/storage/StorageSystem.java
index ec7e34e..30d97a9 100644
--- a/src/dorkbox/util/storage/StorageSystem.java
+++ b/src/dorkbox/util/storage/StorageSystem.java
@@ -256,7 +256,11 @@ class StorageSystem {
                         storage = new DiskStorage(this.file, this.serializationManager, this.readOnly, this.saveDelayInMilliseconds, this.logger);
                         storages.put(this.file, storage);
                     } catch (IOException e) {
-                        String message = e.getMessage().substring(0,e.getMessage().indexOf(OS.LINE_SEPARATOR));
+                        String message = e.getMessage();
+                        int index = message.indexOf(OS.LINE_SEPARATOR);
+                        if (index > -1) {
+                            message = message.substring(0, index);
+                        }
                         if (logger != null) {
                             logger.error("Unable to open storage file at {}. {}", this.file, message);
                         }