Changed execption handling to use catch-exception