Beginning of the end II
Move exception catching to main