diff --git a/trove/common/wsgi.py b/trove/common/wsgi.py
index fc835652e2..d6a8b5fc83 100644
--- a/trove/common/wsgi.py
+++ b/trove/common/wsgi.py
@@ -338,7 +338,8 @@ class Controller(object):
             exception.DatabaseNotFound,
             exception.QuotaResourceUnknown,
             exception.BackupFileNotFound,
-            exception.ClusterNotFound
+            exception.ClusterNotFound,
+            exception.DatastoreNotFound,
         ],
         webob.exc.HTTPConflict: [
             exception.BackupNotCompleteError,
diff --git a/trove/tests/api/backups.py b/trove/tests/api/backups.py
index 4099e99cee..e6b9277a1a 100644
--- a/trove/tests/api/backups.py
+++ b/trove/tests/api/backups.py
@@ -245,7 +245,7 @@ class ListBackups(object):
     @test
     def test_backup_list_filter_datastore_not_found(self):
         """Test list backups and filter by datastore."""
-        assert_raises(exceptions.BadRequest, instance_info.dbaas.backups.list,
+        assert_raises(exceptions.NotFound, instance_info.dbaas.backups.list,
                       datastore='NOT_FOUND')
 
     @test