- add safety checks + warnings