Yes, there are times that a leak from your water heater can be fixed with repair and avoid replacement, but in troubleshooting, you should schedule a visit from a local hot water heater contractor to ensure the best route of recovery for your system.