Add guard. Avoid extra nil? test and set.