diff --git a/SAS/MoM/MoMQueryService/test/t_momqueryservice.py b/SAS/MoM/MoMQueryService/test/t_momqueryservice.py
index 0b89d0b46addda6518d950c55c3ac78d14c7c188..ded735f2d44e49e9195572b44cd07342d9686a4b 100755
--- a/SAS/MoM/MoMQueryService/test/t_momqueryservice.py
+++ b/SAS/MoM/MoMQueryService/test/t_momqueryservice.py
@@ -1766,12 +1766,11 @@ class TestMoMDatabaseWrapper(unittest.TestCase):
         with self.assertRaises(ValueError):
             self.mom_database_wrapper.get_storagemanager(1234)
 
-    def test_get_storagemanager_throws_ValueError_if_station_selection_not_present_in_misc(self):
+    def test_get_storagemanager_returns_None_if_station_selection_not_present_in_misc(self):
         details_result = [{"misc": json.dumps({"timeWindow": {'minDuration': 300, 'maxDuration': 300}})}]
         self.mysql_mock.connect().cursor().fetchall.return_value = details_result
 
-        with self.assertRaises(KeyError):
-            self.mom_database_wrapper.get_storagemanager(1234)
+        self.assertEqual(None, self.mom_database_wrapper.get_storagemanager(1234))
 
 @unittest.skip("Skipping integration test")
 class IntegrationTestMoMDatabaseWrapper(unittest.TestCase):