fix: add logic to handle nil pointer structs (#306)

fix: add logic to handle nil pointer structs (#306) #386