diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py
index ab02117f5f25..92770cc8412d 100644
--- a/nova/conductor/manager.py
+++ b/nova/conductor/manager.py
@@ -118,6 +118,7 @@ class ConductorManager(manager.SchedulerDependentManager):
                                                       metadata, set_delete)
         return jsonutils.to_primitive(new_metadata)
 
+    @rpc_common.client_exceptions(exception.AggregateMetadataNotFound)
     def aggregate_metadata_delete(self, context, aggregate, key):
         self.db.aggregate_metadata_delete(context.elevated(),
                                           aggregate['id'], key)