diff --git a/src/pdr.c b/src/pdr.c
index 3b30329..3ee8886 100644
--- a/src/pdr.c
+++ b/src/pdr.c
@@ -1189,6 +1189,9 @@
 				  pldm_entity *entity)
 {
 	assert(tree != NULL);
+	if (!tree || !entity) {
+		return NULL;
+	}
 
 	pldm_entity_node *node = NULL;
 	entity_association_tree_find(tree->root, entity, &node);