Handled missing links more gracefully