; or (ii) off the premises at a storage facility, or gun range, certified by the Attorney General. . (b) Penalties Section 924(a) of such title is amended by adding at the end the following: (8) (A) (i) Whoever, in a civil action, is found to have violated section 922(aa) with respect to a firearm and the violation is not found to have resulted in a discharge of the firearm, shall be fined not more than $5,000. (ii) Whoever, in a criminal action, is found to have violated section 922(aa) with respect to a firearm and the violation is found to have resulted in a discharge of the firearm, shall be fined not less than $50,000 and not more than $100,000, imprisoned not more than 20 years, or both. (B) On conviction of a person for violating section 922(aa) with respect to a firearm or ammunition, the court shall order the Attorney General to seize and store the firearm or ammunition, at the expense of the owner of the firearm or ammunition, at a facility that is— (i) certified by the Attorney General for the safe storage of firearms or ammunition; and (ii) not owned, leased, or controlled by the person or the owner of the firearm or ammunition or by any person who is a relative of, or is associated with, the person or the owner. . (c) Certification of safes and safe storage facilities Within 1 year after the date of the enactment of this Act, the Attorney General shall provide for the certification of safes and safe storage facilities for firearms and ammunition. (d) Effective date The amendments made by this section shall take effect 1 year after the date of the enactment of this Act. (e) Investigation of reports of improper storage of firearms or ammunition Beginning with the effective date of the amendments made by this section, the Attorney General, through the Bureau of Alcohol, Tobacco, Firearms, and Explosives, shall investigate all reports that a person is improperly storing a firearm or ammunition.