Updated IP Validation and Safety Checks