diff --git a/nova/exception.py b/nova/exception.py
index 323f33c29..a5a7c0f1b 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -1085,6 +1085,12 @@ class InstanceTypeCreateFailed(NovaException):
     message = _("Unable to create instance type")
 
 
+class InstancePasswordSetFailed(NovaException):
+    message = _("Failed to set admin password on %(instance)s "
+                "because %(reason)s")
+    safe = True
+
+
 class SolidFireAPIException(NovaException):
     message = _("Bad response from SolidFire API")