Is this null check still needed?