-Add better exception handling
Note: why eclipse, with the whitespace changes. C'mon, figure it out!