diff --git a/sonic_data_client/virtual_db.go b/sonic_data_client/virtual_db.go
index 2f81a003..c3ded154 100644
--- a/sonic_data_client/virtual_db.go
+++ b/sonic_data_client/virtual_db.go
@@ -135,7 +135,7 @@ func getPfcwdMap() (map[string]map[string]string, error) {
 			return nil, err
 		}
 
-		keyName := fmt.Sprintf("PFC_WD_TABLE%v*", separator)
+		keyName := fmt.Sprintf("PFC_WD%v*", separator)
 		resp, err := redisDb.Keys(keyName).Result()
 		if err != nil {
 			log.V(1).Infof("redis get keys failed for %v in namsepace %v, key = %v, err: %v", dbName, namespace, keyName, err)
@@ -149,7 +149,7 @@ func getPfcwdMap() (map[string]map[string]string, error) {
 		}
 
 		for _, key := range resp {
-			name := key[13:]
+			name := key[7:]
 			pfcwdName_map[name] = make(map[string]string)
 		}
 
diff --git a/sonic_db_config/db_config.go b/sonic_db_config/db_config.go
index 23613bc8..9b279e5b 100644
--- a/sonic_db_config/db_config.go
+++ b/sonic_db_config/db_config.go
@@ -17,6 +17,7 @@ const (
 
 var sonic_db_init bool
 
+// Convert exception to error
 func CatchException(err *error) {
 	if r := recover(); r != nil {
 		*err = fmt.Errorf("%v", r)