Move 2 functions to a better spot.
Fix catching the now-wrong download exception.