T/C sounds like they will make it right. I'd call in a week and ask to speak to "John", or get his e-mail if possible, to see how it is going. My guess is they will send you a new gun because that will probably be the easiest thing for them to do.