I have never had a battery drain problem but I have sent cameras back for other warranty issues shortly after warranty ended, and perhaps because I am an NPS member, they covered them. That's a good reason to join NPS and now that they have opened up membership I think anyone can do so. Used to be, you had to submit a portfolio, get a recommendation, etc. I think all that is gone. Suggest you check that out either way and good luck