Improved Seismic Risk Assessment of Non-ductile Reinforced Concrete Buildings