Avoid errors when changing data by checking variables

Avoid errors when changing data by checking variables #49