diff --git a/mistral/api/controllers/v2/action.py b/mistral/api/controllers/v2/action.py
index da08b1d45..19093bd2c 100644
--- a/mistral/api/controllers/v2/action.py
+++ b/mistral/api/controllers/v2/action.py
@@ -136,6 +136,7 @@ class ActionsController(rest.RestController, hooks.HookController):
 
             db_api.delete_action_definition(identifier)
 
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.Actions, types.uuid, int, types.uniquelist,
                          types.list, types.uniquelist, wtypes.text,
                          wtypes.text, resources.SCOPE_TYPES, wtypes.text,
diff --git a/mistral/api/controllers/v2/action_execution.py b/mistral/api/controllers/v2/action_execution.py
index 2010a64a4..926aed7ed 100644
--- a/mistral/api/controllers/v2/action_execution.py
+++ b/mistral/api/controllers/v2/action_execution.py
@@ -176,6 +176,7 @@ class ActionExecutionsController(rest.RestController):
 
         return resources.ActionExecution.from_dict(values)
 
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.ActionExecutions, types.uuid, int,
                          types.uniquelist, types.list, types.uniquelist,
                          wtypes.text, wtypes.text, wtypes.text,
@@ -288,6 +289,7 @@ class ActionExecutionsController(rest.RestController):
 
 
 class TasksActionExecutionController(rest.RestController):
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.ActionExecutions, types.uuid, types.uuid,
                          int, types.uniquelist, types.list, types.uniquelist,
                          wtypes.text, types.uniquelist, wtypes.text,
diff --git a/mistral/api/controllers/v2/cron_trigger.py b/mistral/api/controllers/v2/cron_trigger.py
index 079a99809..ef0219a2b 100644
--- a/mistral/api/controllers/v2/cron_trigger.py
+++ b/mistral/api/controllers/v2/cron_trigger.py
@@ -83,6 +83,7 @@ class CronTriggersController(rest.RestController):
 
         db_api.delete_cron_trigger(name)
 
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.CronTriggers, types.uuid, int,
                          types.uniquelist, types.list, types.uniquelist,
                          wtypes.text, wtypes.text, types.uuid, types.jsontype,
diff --git a/mistral/api/controllers/v2/environment.py b/mistral/api/controllers/v2/environment.py
index c66537033..358c19a7d 100644
--- a/mistral/api/controllers/v2/environment.py
+++ b/mistral/api/controllers/v2/environment.py
@@ -33,6 +33,7 @@ LOG = logging.getLogger(__name__)
 
 
 class EnvironmentController(rest.RestController):
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.Environments, types.uuid, int,
                          types.uniquelist, types.list, types.uniquelist,
                          wtypes.text, wtypes.text, types.jsontype,
diff --git a/mistral/api/controllers/v2/event_trigger.py b/mistral/api/controllers/v2/event_trigger.py
index 86e5045d1..2346485ac 100644
--- a/mistral/api/controllers/v2/event_trigger.py
+++ b/mistral/api/controllers/v2/event_trigger.py
@@ -116,6 +116,7 @@ class EventTriggersController(rest.RestController):
 
         triggers.delete_event_trigger(event_trigger.to_dict())
 
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.EventTriggers, types.uuid, int,
                          types.uniquelist, types.list, types.uniquelist,
                          types.jsontype)
diff --git a/mistral/api/controllers/v2/execution.py b/mistral/api/controllers/v2/execution.py
index a0e9d4e95..528863ff7 100644
--- a/mistral/api/controllers/v2/execution.py
+++ b/mistral/api/controllers/v2/execution.py
@@ -222,6 +222,7 @@ class ExecutionsController(rest.RestController):
 
         return db_api.delete_workflow_execution(id)
 
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.Executions, types.uuid, int,
                          types.uniquelist, types.list, types.uniquelist,
                          wtypes.text, types.uuid, wtypes.text, types.jsontype,
diff --git a/mistral/api/controllers/v2/task.py b/mistral/api/controllers/v2/task.py
index 2832a7896..c9a33b522 100644
--- a/mistral/api/controllers/v2/task.py
+++ b/mistral/api/controllers/v2/task.py
@@ -48,6 +48,7 @@ def _get_task_resource_with_result(task_ex):
 
 
 class TaskExecutionsController(rest.RestController):
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.Executions, types.uuid, types.uuid, int,
                          types.uniquelist, types.list, types.uniquelist,
                          wtypes.text, types.uuid, wtypes.text, types.jsontype,
@@ -143,6 +144,7 @@ class TasksController(rest.RestController):
 
         return _get_task_resource_with_result(task_ex)
 
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.Tasks, types.uuid, int, types.uniquelist,
                          types.list, types.uniquelist, wtypes.text,
                          wtypes.text, types.uuid, types.uuid, STATE_TYPES,
@@ -286,6 +288,7 @@ class TasksController(rest.RestController):
 
 
 class ExecutionTasksController(rest.RestController):
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.Tasks, types.uuid, types.uuid, int,
                          types.uniquelist, types.list, types.uniquelist,
                          wtypes.text, wtypes.text, types.uuid, STATE_TYPES,
diff --git a/mistral/api/controllers/v2/workbook.py b/mistral/api/controllers/v2/workbook.py
index 68047d51d..cf18d1e3b 100644
--- a/mistral/api/controllers/v2/workbook.py
+++ b/mistral/api/controllers/v2/workbook.py
@@ -93,6 +93,7 @@ class WorkbooksController(rest.RestController, hooks.HookController):
 
         db_api.delete_workbook(name)
 
+    @rest_utils.wrap_wsme_controller_exception
     @wsme_pecan.wsexpose(resources.Workbooks, types.uuid, int,
                          types.uniquelist, types.list, types.uniquelist,
                          wtypes.text, wtypes.text, wtypes.text,