added guard in kvp maker
added guard in kvp maker