diff --git a/EDPlayerJournal/Entries/Entry.cs b/EDPlayerJournal/Entries/Entry.cs
index bc2f09b..3a9b01b 100644
--- a/EDPlayerJournal/Entries/Entry.cs
+++ b/EDPlayerJournal/Entries/Entry.cs
@@ -64,7 +64,15 @@ public class Entry {
     public static Entry? Parse(string journalline) {
         using (JsonReader reader = new JsonTextReader(new StringReader(journalline))) {
             reader.DateParseHandling = DateParseHandling.None;
-            var json = JObject.Load(reader);
+            JObject? json = null;
+            try {
+                json = JObject.Load(reader);
+            } catch (Exception e) {
+                throw new InvalidJournalEntryException(
+                    "invalid JSON journal entry: " + journalline,
+                    e
+                    );
+            }
             if (json == null) {
                 return null;
             }
diff --git a/EDPlayerJournal/JournalException.cs b/EDPlayerJournal/JournalException.cs
index 47e3d76..c24dbc7 100644
--- a/EDPlayerJournal/JournalException.cs
+++ b/EDPlayerJournal/JournalException.cs
@@ -6,6 +6,7 @@
 public class InvalidJournalEntryException : Exception {
     public InvalidJournalEntryException() { }
     public InvalidJournalEntryException(string message) : base(message) { }
+    public InvalidJournalEntryException(string message, Exception inner) : base(message, inner) { }
 }
 
 /// <summary>
diff --git a/EDPlayerJournal/JournalFile.cs b/EDPlayerJournal/JournalFile.cs
index 438906f..bb54ff0 100644
--- a/EDPlayerJournal/JournalFile.cs
+++ b/EDPlayerJournal/JournalFile.cs
@@ -17,6 +17,11 @@ public class JournalFile : IComparable<JournalFile>
     private static Regex update11regex = new Regex("Journal\\.([^\\.]+)\\.(\\d+).log");
     private static string iso8601 = "yyyyMMddTHHmmss";
 
+    /// <summary>
+    /// A public list of errors encountered while parsing the journal files
+    /// </summary>
+    public List<Exception> Errors { get; private set; } = new List<Exception>();
+
     public static bool VerifyFile(string path) {
         string filename = Path.GetFileName(path);
 
@@ -125,14 +130,19 @@ public class JournalFile : IComparable<JournalFile>
         }
 
         entries.Clear();
-        foreach(var line in lines) {
+        Errors.Clear();
+        foreach (var line in lines) {
             // Skip empty lines
             if (line.Trim().Length == 0) {
                 continue;
             }
-            Entry? entry = Entry.Parse(line);
-            if (entry != null) {
-                entries.Add(entry);
+            try {
+                Entry? entry = Entry.Parse(line);
+                if (entry != null) {
+                    entries.Add(entry);
+                }
+            } catch (Exception ex) {
+                Errors.Add(ex);
             }
         }
     }
diff --git a/EDPlayerJournal/PlayerJournal.cs b/EDPlayerJournal/PlayerJournal.cs
index 1a9bf92..fc0b5e6 100644
--- a/EDPlayerJournal/PlayerJournal.cs
+++ b/EDPlayerJournal/PlayerJournal.cs
@@ -22,6 +22,12 @@ public class PlayerJournal {
         ScanFiles();
     }
 
+    public List<Exception> AllErrors {
+        get {
+            return Files.SelectMany(x => x.Errors).ToList();
+        }
+    }
+
     public List<JournalFile> Files {
         get { return journalfiles; }
     }