Some improvements to how we handle load failure

This isn't quite where I want to end up, but it gets Josh's commit off a branch and it's better than what we had.