diff --git a/src/org/forkalsrud/album/web/AlbumServlet.java b/src/org/forkalsrud/album/web/AlbumServlet.java
index 4c02042..83012cd 100644
--- a/src/org/forkalsrud/album/web/AlbumServlet.java
+++ b/src/org/forkalsrud/album/web/AlbumServlet.java
@@ -4,7 +4,6 @@ import java.io.File;
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.concurrent.TimeoutException;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -180,7 +179,7 @@ public class AlbumServlet
             }
         }
         if (cimg == null) {
-        	try {
+//        	try {
         		cimg = pictureScaler.scalePicture(file, thumbnail, size);
         		imageCache.put(new Element(key, cimg));
         		long millisSinceLastFlush = System.currentTimeMillis() - lastCacheFlushTime;
@@ -189,10 +188,10 @@ public class AlbumServlet
         		    lastCacheFlushTime = System.currentTimeMillis();
         		}
         		System.out.println("             " + key + " added to the cache with size " + cimg.bits.length + " -- now " + imageCache.getSize() + " entries");
-        	} catch (TimeoutException e) {
-        		res.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
-        		return;
-        	}
+//        	} catch (TimeoutException e) {
+//        		res.setStatus(HttpServletResponse.SC_SERVICE_UNAVAILABLE);
+//        		return;
+//        	}
         }
         res.setStatus(HttpServletResponse.SC_OK);
         res.setDateHeader("Last-Modified", file.lastModified());
diff --git a/src/org/forkalsrud/album/web/PictureScaler.java b/src/org/forkalsrud/album/web/PictureScaler.java
index 5cd0c97..bd86dcb 100644
--- a/src/org/forkalsrud/album/web/PictureScaler.java
+++ b/src/org/forkalsrud/album/web/PictureScaler.java
@@ -18,7 +18,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.PriorityBlockingQueue;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReadParam;