diff --git a/packages/strapi/lib/middlewares/boom/index.js b/packages/strapi/lib/middlewares/boom/index.js
index edc626314c..99fe78d990 100644
--- a/packages/strapi/lib/middlewares/boom/index.js
+++ b/packages/strapi/lib/middlewares/boom/index.js
@@ -80,9 +80,13 @@ module.exports = strapi => {
           }
 
           // Log error.
-          strapi.log.error(error);
 
           const { status, body } = formatBoomPayload(error);
+
+          if (status >= 500) {
+            strapi.log.error(error);
+          }
+
           ctx.body = body;
           ctx.status = status;
         }
@@ -101,13 +105,13 @@ module.exports = strapi => {
     // Custom function to avoid ctx.body repeat
     createResponses() {
       boomMethods.forEach(method => {
-        strapi.app.response[method] = function(...rest) {
-          const boomError = Boom[method](...rest) || {};
+        strapi.app.response[method] = function(msg, ...rest) {
+          const boomError = Boom[method](msg, ...rest) || {};
 
           const { status, body } = formatBoomPayload(boomError);
 
           // keep retro-compatibility for old error formats
-          body.message = body.data;
+          body.message = msg || body.data || body.message;
 
           this.body = body;
           this.status = status;