Before this, nil values would cause errors

These could happen when the values on disk were missing but were running live on the
system.