diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index b2758b0a6abe55329d30fb9658e0547e5fcb150d..f9436ee9077a570858e2368e75c2c0ed370d0022 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -74,11 +74,11 @@ gulp.task('pre-test', () => {
 gulp.task('test', ['pre-test'], () => {
     process.chdir('build');
     gulp.src('test/test.js', {read: false})
-    .pipe(mocha())
+    .pipe(mocha({timeout: 15000}))
     .pipe(istanbul.writeReports())
     .pipe(istanbul.enforceThresholds({
         thresholds: {
-            global: 80 
+            global: 80
         }
     }))
     .on('error', () => {
diff --git a/src/libs/app.js b/src/libs/app.js
index f43abfb9732b4793d161c51efaf9b7dc857a674c..37e02f87922011bf2c05f39b638b57a5c3c52e0c 100644
--- a/src/libs/app.js
+++ b/src/libs/app.js
@@ -41,7 +41,7 @@ app.use('/api/v1', api);
 // Catch 404 and forward to error handler
 app.use((req, res, next) => {
     res.status(404);
-    log.debug('%s %d %s', req.method, res.statusCode, req.url);
+    log.error('%s %d %s', req.method, res.statusCode, req.url);
     res.json({ error: 'Not found' }).end();
 });
 
diff --git a/src/libs/middlewares/query.js b/src/libs/middlewares/query.js
index a4f20e3ba5bdd31cf7dab85a44121b8e8e456fc0..70a9aab689b5bf1c3827af59b09594d7a3ab787a 100644
--- a/src/libs/middlewares/query.js
+++ b/src/libs/middlewares/query.js
@@ -9,6 +9,7 @@ function query(req, res, next) {
     execQuery(sql.text, sql.values).then((result) => {
         log.debug(result);
         req.result = result;
+        if(result.length === 0) next({status: 404, message: 'Not Found'});
         next();
     }, (error) => {
         next(error);
diff --git a/src/libs/routes/enrollment.js b/src/libs/routes/enrollment.js
index 060976f789b3bd9a5197716c1ffe6d51eabfcdb1..f0c81a55f3accaa2cf1cdd74e175f78db64e7135 100644
--- a/src/libs/routes/enrollment.js
+++ b/src/libs/routes/enrollment.js
@@ -209,11 +209,6 @@ enrollmentApp.get('/', (req, res, next) => {
         .group('turmas.ano_censo')
         .order('turmas.ano_censo');
     next();
-}, query, (req, res, next) => {
-    if(req.result.length === 0) {
-        req.result.push({total: 0});
-    }
-    next();
-}, response('enrollment'));
+}, query, response('enrollment'));
 
 module.exports = enrollmentApp;