Make loading from storage more robust