Don't wait a few years, replace it now. I saw a slight drip under mine while I was replacing a pipe in my kitchen and though I'd have to replace it once I finish the kitchen. Well my wife called me one day at work because she heard water running so I had her shut off the main and drove home. We had to go to the hardware store and pick up another to replace it then so we could shower before work the next day. While I was buying the new heater I found this aluminum pan that looked like a big pie pan with a short piece of pipe sticking out the side. You sit the heater inside it and run the pipe to a drain so if it leaks the water doesn't ruin anything. I had to set mine one a scrap sheet of plywood for extra support because the plywood on the floor looked a bit messed up from the water, I need to pull the heater out someday and replace the floor now.