From ff1e81fe650ccad4c38e326cf5adffe9695c1727 Mon Sep 17 00:00:00 2001
From: jeb228 <jeb228@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 27 Jul 2010 17:25:08 +0000
Subject: [PATCH] NIHVIVO-1026 merge 5508 from the branch.

---
 .../vitro/webapp/controller/freemarker/ImageUploadHelper.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
index 17e91f90e..2e2ee5664 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
@@ -223,6 +223,8 @@ public class ImageUploadHelper {
 		} catch (IOException e) {
 			throw new IllegalStateException("Can't read image file: "
 					+ fileInfo, e);
+		} catch (UserMistakeException e) {
+			throw e;
 		} catch (Exception e) {
 			throw new UserMistakeException("Sorry, we were unable to process "
 					+ "the photo you provided. Please try another photo.");