diff --git a/src/main/java/org/gcube/datatransfer/resolver/http/HttpResolver.java b/src/main/java/org/gcube/datatransfer/resolver/http/HttpResolver.java
index ac933f7..430810d 100644
--- a/src/main/java/org/gcube/datatransfer/resolver/http/HttpResolver.java
+++ b/src/main/java/org/gcube/datatransfer/resolver/http/HttpResolver.java
@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * 
- * @author andrea
+ * @author Andrea Manzi(CERN)
  *
  */
 public class HttpResolver extends HttpServlet {
@@ -45,17 +45,18 @@ public class HttpResolver extends HttpServlet {
 		
 		String uri = request.getParameter("smp-uri");
 
+		if (uri == null || uri.equals("")) {
+			logger.debug("URI not found");
+			response.sendError(404);
+			return;
+		}
+		
 		uri = uri.replace(" ","+");//the char + is removed when the servlet is doing unescaping of the query paramenters, we just put it back
 
 		logger.debug("URI = "+ uri);
 
 		try {
 
-			if (uri == null || uri.equals("")) {
-				// the document has not id - not found
-				response.sendError(404);
-				return;
-			}
 
 			OutputStream out = response.getOutputStream();
 			
@@ -77,7 +78,9 @@ public class HttpResolver extends HttpServlet {
 				in = uc.getInputStream();
 			}
 			catch(Exception e){
-				e.printStackTrace();
+				response.sendError(404);
+				logger.error("Exception:", e);
+				return;
 			}
 
 
@@ -90,6 +93,8 @@ public class HttpResolver extends HttpServlet {
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("Exception:", e);
+			response.sendError(404);
+			return;
 		}
 
 	}