Make loading more robust