More safety code