Made the try/catch actually do something useful
Fixed some indentation
Fixed some more indentation