diff --git a/routes/storage.js b/routes/storage.js
index 67cf835efc77c2d2700d354d4354607f72007e6a..d5dd31078e3e71b1d1309a4000961150ffedf078 100644
--- a/routes/storage.js
+++ b/routes/storage.js
@@ -3,6 +3,8 @@ var router = express.Router();
 var debug = require('debug')('Icarus:server');
 
 var mongoClient = require('mongodb').MongoClient;
+var objectID = mongoClient.objectId;
+
 var assert = assert = require('assert');
 
 // Connection URL
@@ -20,7 +22,6 @@ mongoClient.connect(mongoUrl, function(err, db) {
 
 router.get('/:resource_id', function(req, res, next) {
 
-    var _id = req.params.resource_id;
     mongoClient.connect(mongoUrl, function(err, db) {
 
         if(err!=null){
@@ -32,6 +33,7 @@ router.get('/:resource_id', function(req, res, next) {
 
             var collection = db.collection('resources');
 
+            var _id = new objectID(req.params.resource_id);
             collection.find({"_id":_id}).limit(1).next(function(err, doc){
 
                 if(err!=null){
@@ -43,7 +45,7 @@ router.get('/:resource_id', function(req, res, next) {
 
                     if(doc==undefined){
 
-                        res.sendStatus(400);
+                        res.sendStatus(404);
 
                     }else{