Update to Exception Handling

Remove all System.exits();