Prefer nulls to undefined values
Prepare for supporting CentOS 7