Fixed null/undefined checking... again.