diff --git a/.mailmap b/.mailmap
index 84e31bf5..66ae701d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -79,3 +79,4 @@
 <nsokolov@griddynamics.com> <nsokolov@griddynamics.net>
 <troy.toman@rackspace.com> <ttcl@mac.com>
 <zulcss@ubuntu.com> <chuck.short@canonical.com>
+<jhtran@att.com> <jtran@attinteractive.com>
diff --git a/Authors b/Authors
index 5c5df3d6..88285d97 100644
--- a/Authors
+++ b/Authors
@@ -99,7 +99,7 @@ John Dewey <john@dewey.ws>
 John Garbutt <john.garbutt@citrix.com>
 John Griffith <john.griffith@solidfire.com>
 John Kennedy <john.m.kennedy@intel.com>
-John Tran <jtran@attinteractive.com>
+John Tran <jhtran@att.com>
 Jonathan Bryce <jbryce@jbryce.com>
 Jordan Rinke <jordan@openstack.org>
 Joseph Suh <jsuh@isi.edu>
diff --git a/nova/tests/test_db_api.py b/nova/tests/test_db_api.py
index c1002d98..1abd44a9 100644
--- a/nova/tests/test_db_api.py
+++ b/nova/tests/test_db_api.py
@@ -151,6 +151,8 @@ class DbApiTestCase(test.TestCase):
                           db.network_delete_safe, ctxt, network['id'])
         db.fixed_ip_update(ctxt, address2, {'allocated': False})
         network = db.network_delete_safe(ctxt, network['id'])
+        self.assertRaises(exception.FixedIpNotFoundForAddress,
+                          db.fixed_ip_get_by_address, ctxt, address1)
         ctxt = ctxt.elevated(read_deleted='yes')
         fixed_ip = db.fixed_ip_get_by_address(ctxt, address1)
         self.assertTrue(fixed_ip['deleted'])