Proper Connector Handling