diff --git a/src/main/java/org/forkalsrud/album/exif/Entry.java b/src/main/java/org/forkalsrud/album/exif/Entry.java
index 52bd6ef..f91586e 100644
--- a/src/main/java/org/forkalsrud/album/exif/Entry.java
+++ b/src/main/java/org/forkalsrud/album/exif/Entry.java
@@ -8,6 +8,8 @@ package org.forkalsrud.album.exif;
 import java.io.File;
 import java.util.Date;
 
+import org.apache.commons.lang.builder.ToStringBuilder;
+
 
 /**
  * Represents one item inside the album, typically file or directory, aka photo or album
@@ -125,4 +127,11 @@ public abstract class Entry {
     public boolean groupByYear() {
         return false;
     }
+
+
+
+    @Override
+    public String toString() {
+        return ToStringBuilder.reflectionToString(this);
+    }
 }
diff --git a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
index 60faddc..db4d581 100644
--- a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
+++ b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java
@@ -387,6 +387,7 @@ public class AlbumServlet
             out.println("  \"contents\": [");
             int n = 0;
             for (Entry e : entry.getContents()) {
+                try {
                 if (n++ > 0) out.println(",");
                 out.println("  {");
                 out.println("    \"name\": " + jsStr(e.getName()) + ",");
@@ -397,6 +398,9 @@ public class AlbumServlet
                 out.println("    \"height\": " + e.getThumbnail().getSize().getHeight() + ",");
                 out.println("    \"caption\": " + jsStr(e.getCaption()));
                 out.print("  }");
+                } catch (Exception ex) {
+                    throw new Exception(e.toString(), ex);
+                }
             }
             out.println();
             out.println("  ]");