diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py
index 2f9e8a5ec805..29dd59ef5e96 100644
--- a/nova/network/neutronv2/api.py
+++ b/nova/network/neutronv2/api.py
@@ -104,7 +104,7 @@ def _load_auth_plugin(conf):
     if auth_plugin:
         return auth_plugin
 
-    err_msg = _('Unknown auth plugin: %s') % conf.neutron.auth_plugin
+    err_msg = _('Unknown auth type: %s') % conf.neutron.auth_type
     raise neutron_client_exc.Unauthorized(message=err_msg)
 
 
diff --git a/nova/tests/unit/network/test_neutronv2.py b/nova/tests/unit/network/test_neutronv2.py
index 7e207f949e01..75d49cf65602 100644
--- a/nova/tests/unit/network/test_neutronv2.py
+++ b/nova/tests/unit/network/test_neutronv2.py
@@ -181,6 +181,13 @@ class TestNeutronClient(test.NoDBTestCase):
         client1.list_networks(retrieve_all=False)
         self.assertEqual('new_token2', client1.httpclient.auth.get_token(None))
 
+    @mock.patch.object(ks_loading, 'load_auth_from_conf_options')
+    def test_load_auth_plugin_failed(self, mock_load_from_conf):
+        mock_load_from_conf.return_value = None
+        from neutronclient.common import exceptions as neutron_client_exc
+        self.assertRaises(neutron_client_exc.Unauthorized,
+                          neutronapi._load_auth_plugin, CONF)
+
 
 class TestNeutronv2Base(test.TestCase):