Superbowl commit! (Only a day late. =V) Adds some error handling.