diff --git a/src/main/java/cloudgene/mapred/server/controller/DownloadController.java b/src/main/java/cloudgene/mapred/server/controller/DownloadController.java
index 47fd8c20..c5853e0c 100644
--- a/src/main/java/cloudgene/mapred/server/controller/DownloadController.java
+++ b/src/main/java/cloudgene/mapred/server/controller/DownloadController.java
@@ -78,8 +78,12 @@ public MutableHttpResponse<InputStream> downloadPublicLink(String hash, String f
 
 		String message = String.format("Job: Anonymously downloading file '%s' (hash %s)", filename, hash);
 		log.info(message);
-		return downloadService.download(download);
-
+		try {
+			return downloadService.download(download);
+		} catch (Exception e) {
+			log.error("Downloading file failed.", e);
+			throw new JsonHttpStatusException(HttpStatus.NOT_FOUND, "File not found in workspace.");
+		}
 	}
 
 	@Get("/browse/{hash}/{filename:.+}")