Make loading packages safer