Fixed null-related errors from switching to strict equality everywhere