diff --git a/cinder/db/sqlalchemy/api.py b/cinder/db/sqlalchemy/api.py
index 8e3c47293a8..52b1e73e16b 100644
--- a/cinder/db/sqlalchemy/api.py
+++ b/cinder/db/sqlalchemy/api.py
@@ -121,9 +121,8 @@ def get_backend():
 def is_admin_context(context):
     """Indicates if the request context is an administrator."""
     if not context:
-        LOG.warning('Use of empty request context is deprecated',
-                    DeprecationWarning)
-        raise Exception('die')
+        raise exception.CinderException(
+            'Use of empty request context is deprecated')
     return context.is_admin