Added back in for null check