fix: check for nil values before dereferencing

fix: check for nil values before dereferencing #13796