ADD: More null checking to temp variables.