Added error validation and made sure shipping is being charged. Done for the night