Exception handling

Missing when /