diff --git a/src/pdr.c b/src/pdr.c
index 55350a8..657612d 100644
--- a/src/pdr.c
+++ b/src/pdr.c
@@ -154,10 +154,14 @@
 	assert(data != NULL);
 	assert(size != NULL);
 	assert(next_record_handle != NULL);
+	if (!repo || !data || !size || !next_record_handle) {
+		return NULL;
+	}
 
 	if (!record_handle && (repo->first != NULL)) {
 		record_handle = repo->first->record_handle;
 	}
+
 	pldm_pdr_record *record = repo->first;
 	while (record != NULL) {
 		if (record->record_handle == record_handle) {
@@ -186,6 +190,9 @@
 	assert(data != NULL);
 	assert(size != NULL);
 	assert(next_record_handle != NULL);
+	if (!repo || !curr_record || !data || !size || !next_record_handle) {
+		return NULL;
+	}
 
 	if (curr_record == repo->last) {
 		*data = NULL;